Binary files /tmp/tmpxOYvGB/oAOFqSYdPQ/language-pack-my-base-16.04+20160322/data/extra.tar and /tmp/tmpxOYvGB/0qLTIdXSWH/language-pack-my-base-16.04+20160415/data/extra.tar differ diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/acl.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/acl.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/acl.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/acl.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:06+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:42+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../chacl/chacl.c:46 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/activity-log-manager.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/activity-log-manager.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/activity-log-manager.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/activity-log-manager.po 2016-04-15 08:51:15.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 14:19+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:56+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../data/activity-log-manager.desktop.in.h:1 ../src/alm.vala:30 msgid "Activity Log Manager" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/adduser.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/adduser.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/adduser.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/adduser.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:12+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:47+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. everyone can issue "--help" and "--version", but only root can go on #: ../adduser:154 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/app-install-data.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/app-install-data.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/app-install-data.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/app-install-data.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:27+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:08+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apport.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apport.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apport.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apport.po 2016-04-15 08:51:13.000000000 +0000 @@ -7,330 +7,211 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2016-02-16 07:51+0000\n" +"POT-Creation-Date: 2016-04-14 03:19+0000\n" "PO-Revision-Date: 2015-05-09 17:49+0000\n" "Last-Translator: Rockworld \n" "Language-Team: Burmese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:12+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:52+0000\n" +"X-Generator: Launchpad (build 17995)\n" -#: ../gtk/apport-gtk.py:142 ../debian/tmp/usr/bin/apport-cli.py:150 -#: ../bin/apport-cli.py:150 ../debian/tmp/usr/share/apport/apport-kde.py:362 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 ../kde/apport-kde.py:362 -msgid "(binary data)" -msgstr "(binary data)" +#: ../bin/apport-cli.py:74 ../debian/tmp/usr/bin/apport-cli.py:74 +msgid "Press any key to continue..." +msgstr "ဆက်လုပ်ရန်ကီးဘုတ်မှခလုတ်တစ်ခုခုကိုနှိပ်ပါ" -#: ../gtk/apport-gtk.py:157 ../debian/tmp/usr/share/apport/apport-gtk.py:157 -#, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "ဆောရီး application %s သည်ရုပ်တရက်ရပ်သွားသည်။" +#: ../bin/apport-cli.py:81 ../debian/tmp/usr/bin/apport-cli.py:81 +msgid "What would you like to do? Your options are:" +msgstr "သင်ဘာလုပ်လိုပါသလဲ။ သင်၏ရွေးချယ်မှု့များကတော့ -" -#: ../gtk/apport-gtk.py:160 ../debian/tmp/usr/share/apport/apport-gtk.py:160 +#: ../bin/apport-cli.py:85 ../debian/tmp/usr/bin/apport-cli.py:85 #, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "ဆောရီး %s သည်မမျှော်လင့်ပဲပိတ်သွားပါသည်" +msgid "Please choose (%s):" +msgstr "ကျေးဇူးပြုပြီးရွေးပါ (%s):" -#: ../gtk/apport-gtk.py:165 ../debian/tmp/usr/share/apport/apport-kde.py:199 -#: ../debian/tmp/usr/share/apport/apport-kde.py:237 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 ../kde/apport-kde.py:199 -#: ../kde/apport-kde.py:237 +#: ../bin/apport-cli.py:148 ../debian/tmp/usr/bin/apport-cli.py:148 #, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "ဆောရီး, %s သည်အတွင်းပိုင်းပြသာနာတက်နေသည်။" +msgid "(%i bytes)" +msgstr "(%i bytes)" -#: ../gtk/apport-gtk.py:177 ../debian/tmp/usr/bin/apport-cli.py:178 -#: ../bin/apport-cli.py:178 ../debian/tmp/usr/share/apport/apport-kde.py:185 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 ../kde/apport-kde.py:185 +#: ../bin/apport-cli.py:150 ../debian/tmp/usr/bin/apport-cli.py:150 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 +#: ../debian/tmp/usr/share/apport/apport-kde.py:362 ../kde/apport-kde.py:362 +#: ../gtk/apport-gtk.py:142 +msgid "(binary data)" +msgstr "(binary data)" + +#: ../bin/apport-cli.py:178 ../debian/tmp/usr/bin/apport-cli.py:178 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 +#: ../debian/tmp/usr/share/apport/apport-kde.py:185 ../kde/apport-kde.py:185 +#: ../gtk/apport-gtk.py:177 msgid "Send problem report to the developers?" msgstr "developer ဆီသို့ပြသာနာများကို သတင်းပို့မည်" -#: ../gtk/apport-gtk.py:186 ../debian/tmp/usr/share/apport/apport-kde.py:193 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 ../kde/apport-kde.py:193 -msgid "Send" -msgstr "ပို့မည်။" - -#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 -#: ../debian/tmp/usr/share/apport/apport-kde.py:291 ../gtk/apport-gtk.ui.h:9 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:291 -msgid "Show Details" -msgstr "အသေးစိတ်များကို ဖော်ပြပါ။" - -#: ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 -#: ../debian/tmp/usr/share/apport/apport-kde.py:230 -#: ../debian/tmp/usr/share/apport/apport-kde.py:243 ../gtk/apport-gtk.ui.h:12 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:284 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 ../kde/apport-kde.py:230 -#: ../kde/apport-kde.py:243 -msgid "Continue" -msgstr "ဆက်လုပ်" - -#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228 -msgid "Force Closed" -msgstr "အတင်းပိတ်မည်" - -#: ../gtk/apport-gtk.py:229 ../gtk/apport-gtk.py:288 -#: ../debian/tmp/usr/share/apport/apport-kde.py:234 -#: ../debian/tmp/usr/share/apport/apport-kde.py:380 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:229 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 ../kde/apport-kde.py:234 -#: ../kde/apport-kde.py:380 -msgid "Relaunch" -msgstr "ပြန်ဖွင့်မည်" - -#: ../gtk/apport-gtk.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:238 -#, python-format -msgid "The application %s has stopped responding." -msgstr "ဒီ application %s တုံ့ပြန်ရပ်တန့်ခဲ့သည်။" - -#: ../gtk/apport-gtk.py:242 ../debian/tmp/usr/share/apport/apport-gtk.py:242 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "အဆိုပါအစီအစဉ်ကို \"%s\" တုန့်ပြန်ရပ်တန့်ခဲ့သည်။" - -#: ../gtk/apport-gtk.py:257 ../debian/tmp/usr/share/apport/apport-kde.py:207 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 ../kde/apport-kde.py:207 -#, python-format -msgid "Package: %s" -msgstr "Package: %s" - -#: ../gtk/apport-gtk.py:264 ../debian/tmp/usr/share/apport/apport-kde.py:213 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 ../kde/apport-kde.py:213 -msgid "Sorry, a problem occurred while installing software." -msgstr "ဆောရီး၊ ဆော့ဝဲလ်သွင်းနေစဉ်ပြသာနာအနည်းငယ်ရှိသည်။" - -#: ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292 -#: ../debian/tmp/usr/share/apport/apport-kde.py:219 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:273 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 ../kde/apport-kde.py:219 -#, python-format -msgid "The application %s has experienced an internal error." +#: ../bin/apport-cli.py:179 ../debian/tmp/usr/bin/apport-cli.py:179 +msgid "" +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." msgstr "" -#: ../gtk/apport-gtk.py:276 ../debian/tmp/usr/share/apport/apport-kde.py:222 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 ../kde/apport-kde.py:222 +#: ../bin/apport-cli.py:182 ../debian/tmp/usr/bin/apport-cli.py:182 #, python-format -msgid "The application %s has closed unexpectedly." -msgstr "application %s သည်မမျှော်လင့်ပဲပိတ်သွားသည်" - -#: ../gtk/apport-gtk.py:287 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 -#: ../debian/tmp/usr/share/apport/apport-kde.py:233 ../gtk/apport-gtk.ui.h:11 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 ../kde/apport-kde.py:233 -msgid "Leave Closed" -msgstr "ပိတ်လိုက်မည်" +msgid "&Send report (%s)" +msgstr "&S အစီရင်ခံစာကိုပို့မည် (%s)" -#: ../gtk/apport-gtk.py:300 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 -#: ../debian/tmp/usr/share/apport/apport-kde.py:240 ../gtk/apport-gtk.ui.h:6 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 ../kde/apport-kde.py:240 -msgid "If you notice further problems, try restarting the computer." +#: ../bin/apport-cli.py:186 ../debian/tmp/usr/bin/apport-cli.py:186 +msgid "&Examine locally" msgstr "" -"နောက်ထပ်ပြသာနာများကိုတွေ့ရှိပါက " -"သင်၏ကွန်ပြူတာကိုပိတ်ပြီးပြန်ဖွင့်ခြင်းဖြင့်ကြိုးစားကြည့်ပါ" -#: ../gtk/apport-gtk.py:304 ../debian/tmp/usr/share/apport/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 ../kde/apport-kde.py:244 -msgid "Ignore future problems of this type" -msgstr "ဒီလိုအမျိုးအစားပြသာနာများကိုလစ်လျူရှုမည်" - -#: ../gtk/apport-gtk.py:577 ../debian/tmp/usr/share/apport/apport-kde.py:288 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 ../kde/apport-kde.py:288 -msgid "Hide Details" -msgstr "အချက်အလက်များကို ဖျောက်ထားမည်" +#: ../bin/apport-cli.py:190 ../debian/tmp/usr/bin/apport-cli.py:190 +msgid "&View report" +msgstr "&V အစီရင်ခံစာကိုကြည့်မည်" -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" +#: ../bin/apport-cli.py:191 ../debian/tmp/usr/bin/apport-cli.py:191 +msgid "&Keep report file for sending later or copying to somewhere else" msgstr "" -#: ../apport/com.ubuntu.apport.policy.in.h:2 -msgid "" -"Authentication is required to collect system information for this problem " -"report" +#: ../bin/apport-cli.py:192 ../debian/tmp/usr/bin/apport-cli.py:192 +msgid "Cancel and &ignore future crashes of this program version" msgstr "" -"authentication ဤပြဿနာကိုအစီရင်ခံစာသည် system " -"သတင်းအချက်အလက်စုဆောင်းဖို့လိုအပ်သည်" -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "System ကိုပြဿနာအစီရင်ခံစာများ" +#: ../bin/apport-cli.py:194 ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 +#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:194 +#: ../debian/tmp/usr/bin/apport-cli.py:271 +#: ../debian/tmp/usr/bin/apport-cli.py:303 +#: ../debian/tmp/usr/bin/apport-cli.py:324 +msgid "&Cancel" +msgstr "&C ပယ်ဖျက်မည်" -#: ../apport/com.ubuntu.apport.policy.in.h:4 -msgid "" -"Please enter your password to access problem reports of system programs" +#: ../bin/apport-cli.py:222 ../debian/tmp/usr/bin/apport-cli.py:222 +msgid "Problem report file:" msgstr "" -"မိမိကွန်ပျူတာ၏စနစ်ကိုပြဿနာအစီရင်ခံစာများဝင်ရောက်ကြည့်ရှုရန်သင့် password " -"ကိုရိုက်ထည့်ပေးပါ" -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 -#: ../data/apportcheckresume.py:67 -msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." -msgstr "" +#: ../bin/apport-cli.py:228 ../bin/apport-cli.py:233 +#: ../debian/tmp/usr/bin/apport-cli.py:228 +#: ../debian/tmp/usr/bin/apport-cli.py:233 +msgid "&Confirm" +msgstr "&C အတည်ပြုမည်" -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 -#: ../data/apportcheckresume.py:69 -msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." -msgstr "" +#: ../bin/apport-cli.py:232 ../debian/tmp/usr/bin/apport-cli.py:232 +#, python-format +msgid "Error: %s" +msgstr "ချို့ယွင်းချက် - %s" -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 -#: ../data/apportcheckresume.py:74 +#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 +#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406 +msgid "Collecting problem information" +msgstr "ပြသာနာအချက်အလက်များကိုစုစည်းနေပါသည်" + +#: ../bin/apport-cli.py:239 ../debian/tmp/usr/bin/apport-cli.py:239 msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." msgstr "" -#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 -msgid "Do not put the new traces into the report, but write them to stdout." -msgstr "တင်ပြမှုတွင်လမ်းကြောင်းသစ်များမထည့်ပါနှင့် သို့သော် stdout တွင်ရေးပါ" - -#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 -msgid "" -"Start an interactive gdb session with the report's core dump (-o ignored; " -"does not rewrite report)" +#: ../bin/apport-cli.py:251 ../debian/tmp/usr/bin/apport-cli.py:251 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 +#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../gtk/apport-gtk.ui.h:15 +#: ../kde/apport-kde.py:434 +msgid "Uploading problem information" msgstr "" -"gdb အပြန်အလှန်ကဏ္ဍကို တင်ပြမှုရဲ့ ပင်မအစုဖြင့်စတင်ပါ (-o လျစ်လျှူရှု; " -"တင်ပြမှုကိုပြန်လည်မရေးတော့ပါ)" -#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 +#: ../bin/apport-cli.py:252 ../debian/tmp/usr/bin/apport-cli.py:252 msgid "" -"Write modified report to given file instead of changing the original report" -msgstr "မူလတင်ပြချက်ကို ပြင်မည့်အစား အသစ်ပြင်ထားသောတင်ပြချက်ကိုရေး၍ပေးပါ" - -#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 -msgid "Remove the core dump from the report after stack trace regeneration" -msgstr "ခြေရာခံမှုထုတ်ပြန်ပြီးနောက် ပင်မပြဿနာအစုကို တင်ပြမှုမှဖယ်ထုတ်ပါ" - -#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 -msgid "Override report's CoreFile" -msgstr "တင်ပြမှုရဲ့ အဓိကဖိုင်ကို ပြင်ရေးပါ" - -#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 -msgid "Override report's ExecutablePath" -msgstr "တင်ပြမှုရဲ့ ခွင့်ပြုလမ်းကြောင်းကိုပြင်ရေးပါ" +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." +msgstr "" -#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 -msgid "Override report's ProcMaps" -msgstr "တင်ပြမှုရဲ့ ProcMaps ကိုပြင်ရေးပါ" +#: ../bin/apport-cli.py:302 ../debian/tmp/usr/bin/apport-cli.py:302 +msgid "&Done" +msgstr "&D ပြီးပါပြီ" -#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 -msgid "Rebuild report's Package information" -msgstr "တင်ပြမှုရဲ့ ပက်ကေ့ချ်အချက်အလက်ကို ပြန်တည်ဆောက်ပါ" +#: ../bin/apport-cli.py:308 ../debian/tmp/usr/bin/apport-cli.py:308 +msgid "none" +msgstr "ဘာမှမဟုတ်" -#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 -msgid "" -"Build a temporary sandbox and download/install the necessary packages and " -"debug symbols in there; without this option it assumes that the necessary " -"packages and debug symbols are already installed in the system. The argument " -"points to the packaging system configuration base directory; if you specify " -"\"system\", it will use the system configuration files, but will then only " -"be able to retrace crashes that happened on the currently running release." +#: ../bin/apport-cli.py:309 ../debian/tmp/usr/bin/apport-cli.py:309 +#, python-format +msgid "Selected: %s. Multiple choices:" msgstr "" -"ယာယီ ပေးပို့မှုတည်ဆောက်ပြီး လိုအပ်သော ပက်ကေ့ချ်များကို " -"ဆွဲချခြင်းတပ်ဆင်ခြင်းနှင့် အပြစ်တွေ့ရှိမှုရဲ့သင်္ကေတရှိနေမည်။ " -"ဤရွေးချယ်မှုမပါဝင်ပါကလိုအပ်သောပက်ကေ့ချ်များနှင့် " -"အပြစ်တွေ့ရှိမှုရဲ့သင်္ကေတများရှိပြီးသားဟုမှတ်ယူမည်။ပက်ကေ့ချ်စနစ်ရဲ့ပြုပြင်ပြီ" -"းသားအခြေခံလမ်းကြောင်းတွင်ရှိသော ထပ်ဖြည့်မှတ်များ၌ " -"အကယ်၍သင့်အနေဖြင့်စနစ်ဟုသတ်မှတ်လျှင် ၎င်းတို့သည် " -"စနစ်ရဲ့စီမံပြီးသားဖိုင်တွေကိုအသုံးပြုမည်။သို့သော် " -"ပျက်စီးမှုလမ်းကြောင်းများကိုသာသိနိုင်ပြီးယခုလက်ရှိထွက်ရှိမှုတွင်သာအကြုံးဝင်သည" -"်။" -#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 -msgid "" -"Report download/install progress when installing packages into sandbox" -msgstr "" +#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 +msgid "Choices:" +msgstr "ရွေးချယ်မှု့များ -" -#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 -msgid "Prepend timestamps to log messages, for batch operation" +#: ../bin/apport-cli.py:339 ../debian/tmp/usr/bin/apport-cli.py:339 +msgid "Path to file (Enter to cancel):" msgstr "" -#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 -msgid "" -"Create and use third-party repositories from origins specified in reports" -msgstr "" +#: ../bin/apport-cli.py:345 ../debian/tmp/usr/bin/apport-cli.py:345 +msgid "File does not exist." +msgstr "ဖိုင်မတည်ရှိပါ" -#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 -msgid "Cache directory for packages downloaded in the sandbox" +#: ../bin/apport-cli.py:347 ../debian/tmp/usr/bin/apport-cli.py:347 +msgid "This is a directory." msgstr "" -#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 -msgid "" -"Directory for unpacked packages. Future runs will assume that any already " -"downloaded package is also extracted to this sandbox." -msgstr "" +#: ../bin/apport-cli.py:353 ../debian/tmp/usr/bin/apport-cli.py:353 +msgid "To continue, you must visit the following URL:" +msgstr "ဆက်လက်သွားရန်အတွက် အောက်ပါ URL ကိုအလည်သွားမှရမည် -" -#: ../debian/tmp/usr/bin/apport-retrace.py:63 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-valgrind.py:66 -#: ../bin/apport-retrace.py:63 +#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" +"You can launch a browser now, or copy this URL into a browser on another " +"computer." msgstr "" -#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-retrace.py:65 -msgid "" -"Path to a file with the crash database authentication information. This is " -"used when specifying a crash ID to upload the retraced stack traces (only if " -"neither -g, -o, nor -s are specified)" -msgstr "" +#: ../bin/apport-cli.py:357 ../debian/tmp/usr/bin/apport-cli.py:357 +msgid "Launch a browser now" +msgstr "browser တစ်ခုကိုဖွင့်မည်" -#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 -msgid "" -"Display retraced stack traces and ask for confirmation before sending them " -"to the crash database." +#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 +msgid "No pending crash reports. Try --help for more information." msgstr "" -#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 -msgid "" -"Path to the duplicate sqlite database (default: no duplicate checking)" -msgstr "" +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 +msgid "Report a problem..." +msgstr "ပြသာနာတစ်ခုကိုသတင်းပို့မည်" -#: ../debian/tmp/usr/bin/apport-retrace.py:78 ../bin/apport-retrace.py:78 -msgid "You cannot use -C without -S. Stopping." +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 +#: ../kde/apport-kde-mime.desktop.in.h:2 +msgid "Report a malfunction to the developers" msgstr "" -#. translators: don't translate y/n, apport currently only checks for "y" -#: ../debian/tmp/usr/bin/apport-retrace.py:111 ../bin/apport-retrace.py:111 -msgid "OK to send these as attachments? [y/n]" +#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " msgstr "" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:141 -#: ../data/general-hooks/ubuntu.py:141 -msgid "" -"An Ubuntu package has a file conflict with a package that is not a genuine " -"Ubuntu package." +#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 +msgid "Destination directory exists and is not empty." msgstr "" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:149 -#: ../data/general-hooks/ubuntu.py:149 -msgid "You have already encountered this package installation failure." +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 +msgid "" +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." msgstr "" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:165 -#: ../data/general-hooks/ubuntu.py:165 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 msgid "" -"Your system was initially configured with grub version 2, but you have " -"removed it from your system in favor of grub 1 without configuring it. To " -"ensure your bootloader configuration is updated whenever a new kernel is " -"available, open a terminal and run:\n" -"\n" -" sudo apt-get install grub-pc\n" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." msgstr "" -#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../data/apportcheckresume.py:74 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." msgstr "" -#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 -msgid "Destination directory exists and is not empty." +#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 @@ -357,6 +238,15 @@ msgid "Sorry, an internal error happened." msgstr "ဆောရီး၊ အတွင်းပိုင်းပြသာနာတက်နေပါသည်" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 +#: ../debian/tmp/usr/share/apport/apport-kde.py:240 ../gtk/apport-gtk.ui.h:6 +#: ../kde/apport-kde.py:240 ../gtk/apport-gtk.py:300 +msgid "If you notice further problems, try restarting the computer." +msgstr "" +"နောက်ထပ်ပြသာနာများကိုတွေ့ရှိပါက " +"သင်၏ကွန်ပြူတာကိုပိတ်ပြီးပြန်ဖွင့်ခြင်းဖြင့်ကြိုးစားကြည့်ပါ" + #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 msgid "Send an error report to help fix this problem" msgstr "ဤပြဿနာကိုဖြေရှင်းကူညီဆိုတဲ့ error အစီရင်ခံစာ Send" @@ -365,10 +255,36 @@ msgid "Ignore future problems of this program version" msgstr "ဒီပရိုဂရမ်ဗားရှင်း၏အနာဂတ်ပြဿနာတွေ Ignore" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 +#: ../debian/tmp/usr/share/apport/apport-kde.py:291 ../gtk/apport-gtk.ui.h:9 +#: ../kde/apport-kde.py:291 ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573 +msgid "Show Details" +msgstr "အသေးစိတ်များကို ဖော်ပြပါ။" + #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../gtk/apport-gtk.ui.h:10 msgid "_Examine locally" msgstr "" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 +#: ../debian/tmp/usr/share/apport/apport-kde.py:233 ../gtk/apport-gtk.ui.h:11 +#: ../kde/apport-kde.py:233 ../gtk/apport-gtk.py:287 +msgid "Leave Closed" +msgstr "ပိတ်လိုက်မည်" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:284 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 +#: ../debian/tmp/usr/share/apport/apport-kde.py:230 +#: ../debian/tmp/usr/share/apport/apport-kde.py:243 ../gtk/apport-gtk.ui.h:12 +#: ../kde/apport-kde.py:230 ../kde/apport-kde.py:243 ../gtk/apport-gtk.py:216 +#: ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303 +msgid "Continue" +msgstr "ဆက်လုပ်" + #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../gtk/apport-gtk.ui.h:13 msgid "Collecting problem information" msgstr "ပြဿနာအချက်အလက်များကိုစုဆောင်းနေပါသည်" @@ -379,13 +295,6 @@ "you report." msgstr "" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 -#: ../debian/tmp/usr/bin/apport-cli.py:251 ../bin/apport-cli.py:251 -#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../gtk/apport-gtk.ui.h:15 -#: ../kde/apport-kde.py:434 -msgid "Uploading problem information" -msgstr "" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16 msgid "Uploading problem information" msgstr "" @@ -398,197 +307,137 @@ "might take a few minutes." msgstr "" -#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "" - -#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 -msgid "Report a problem..." -msgstr "ပြသာနာတစ်ခုကိုသတင်းပို့မည်" - -#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 -msgid "Report a malfunction to the developers" +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:141 +#: ../data/general-hooks/ubuntu.py:141 +msgid "" +"An Ubuntu package has a file conflict with a package that is not a genuine " +"Ubuntu package." msgstr "" -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:149 +#: ../data/general-hooks/ubuntu.py:149 +msgid "You have already encountered this package installation failure." msgstr "" -#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74 -msgid "Press any key to continue..." -msgstr "ဆက်လုပ်ရန်ကီးဘုတ်မှခလုတ်တစ်ခုခုကိုနှိပ်ပါ" - -#: ../debian/tmp/usr/bin/apport-cli.py:81 ../bin/apport-cli.py:81 -msgid "What would you like to do? Your options are:" -msgstr "သင်ဘာလုပ်လိုပါသလဲ။ သင်၏ရွေးချယ်မှု့များကတော့ -" - -#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85 -#, python-format -msgid "Please choose (%s):" -msgstr "ကျေးဇူးပြုပြီးရွေးပါ (%s):" - -#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148 -#, python-format -msgid "(%i bytes)" -msgstr "(%i bytes)" - -#: ../debian/tmp/usr/bin/apport-cli.py:179 ../bin/apport-cli.py:179 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:165 +#: ../data/general-hooks/ubuntu.py:165 msgid "" -"After the problem report has been sent, please fill out the form in the\n" -"automatically opened web browser." +"Your system was initially configured with grub version 2, but you have " +"removed it from your system in favor of grub 1 without configuring it. To " +"ensure your bootloader configuration is updated whenever a new kernel is " +"available, open a terminal and run:\n" +"\n" +" sudo apt-get install grub-pc\n" msgstr "" -#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157 #, python-format -msgid "&Send report (%s)" -msgstr "&S အစီရင်ခံစာကိုပို့မည် (%s)" - -#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186 -msgid "&Examine locally" -msgstr "" - -#: ../debian/tmp/usr/bin/apport-cli.py:190 ../bin/apport-cli.py:190 -msgid "&View report" -msgstr "&V အစီရင်ခံစာကိုကြည့်မည်" - -#: ../debian/tmp/usr/bin/apport-cli.py:191 ../bin/apport-cli.py:191 -msgid "&Keep report file for sending later or copying to somewhere else" -msgstr "" - -#: ../debian/tmp/usr/bin/apport-cli.py:192 ../bin/apport-cli.py:192 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "" - -#: ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/bin/apport-cli.py:271 -#: ../debian/tmp/usr/bin/apport-cli.py:303 -#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:194 -#: ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 ../bin/apport-cli.py:324 -msgid "&Cancel" -msgstr "&C ပယ်ဖျက်မည်" - -#: ../debian/tmp/usr/bin/apport-cli.py:222 ../bin/apport-cli.py:222 -msgid "Problem report file:" -msgstr "" - -#: ../debian/tmp/usr/bin/apport-cli.py:228 -#: ../debian/tmp/usr/bin/apport-cli.py:233 ../bin/apport-cli.py:228 -#: ../bin/apport-cli.py:233 -msgid "&Confirm" -msgstr "&C အတည်ပြုမည်" +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "ဆောရီး application %s သည်ရုပ်တရက်ရပ်သွားသည်။" -#: ../debian/tmp/usr/bin/apport-cli.py:232 ../bin/apport-cli.py:232 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160 #, python-format -msgid "Error: %s" -msgstr "ချို့ယွင်းချက် - %s" - -#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 -#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406 -msgid "Collecting problem information" -msgstr "ပြသာနာအချက်အလက်များကိုစုစည်းနေပါသည်" - -#: ../debian/tmp/usr/bin/apport-cli.py:239 ../bin/apport-cli.py:239 -msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." -msgstr "" - -#: ../debian/tmp/usr/bin/apport-cli.py:252 ../bin/apport-cli.py:252 -msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." -msgstr "" - -#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302 -msgid "&Done" -msgstr "&D ပြီးပါပြီ" - -#: ../debian/tmp/usr/bin/apport-cli.py:308 ../bin/apport-cli.py:308 -msgid "none" -msgstr "ဘာမှမဟုတ်" +msgid "Sorry, %s has closed unexpectedly." +msgstr "ဆောရီး %s သည်မမျှော်လင့်ပဲပိတ်သွားပါသည်" -#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 +#: ../debian/tmp/usr/share/apport/apport-kde.py:199 +#: ../debian/tmp/usr/share/apport/apport-kde.py:237 ../kde/apport-kde.py:199 +#: ../kde/apport-kde.py:237 ../gtk/apport-gtk.py:165 #, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "" +msgid "Sorry, %s has experienced an internal error." +msgstr "ဆောရီး, %s သည်အတွင်းပိုင်းပြသာနာတက်နေသည်။" -#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 -msgid "Choices:" -msgstr "ရွေးချယ်မှု့များ -" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 +#: ../debian/tmp/usr/share/apport/apport-kde.py:193 ../kde/apport-kde.py:193 +#: ../gtk/apport-gtk.py:186 +msgid "Send" +msgstr "ပို့မည်။" -#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339 -msgid "Path to file (Enter to cancel):" -msgstr "" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228 +msgid "Force Closed" +msgstr "အတင်းပိတ်မည်" -#: ../debian/tmp/usr/bin/apport-cli.py:345 ../bin/apport-cli.py:345 -msgid "File does not exist." -msgstr "ဖိုင်မတည်ရှိပါ" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:229 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 +#: ../debian/tmp/usr/share/apport/apport-kde.py:234 +#: ../debian/tmp/usr/share/apport/apport-kde.py:380 ../kde/apport-kde.py:234 +#: ../kde/apport-kde.py:380 ../gtk/apport-gtk.py:229 ../gtk/apport-gtk.py:288 +msgid "Relaunch" +msgstr "ပြန်ဖွင့်မည်" -#: ../debian/tmp/usr/bin/apport-cli.py:347 ../bin/apport-cli.py:347 -msgid "This is a directory." -msgstr "" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238 +#, python-format +msgid "The application %s has stopped responding." +msgstr "ဒီ application %s တုံ့ပြန်ရပ်တန့်ခဲ့သည်။" -#: ../debian/tmp/usr/bin/apport-cli.py:353 ../bin/apport-cli.py:353 -msgid "To continue, you must visit the following URL:" -msgstr "ဆက်လက်သွားရန်အတွက် အောက်ပါ URL ကိုအလည်သွားမှရမည် -" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "အဆိုပါအစီအစဉ်ကို \"%s\" တုန့်ပြန်ရပ်တန့်ခဲ့သည်။" -#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 -msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 +#: ../debian/tmp/usr/share/apport/apport-kde.py:207 ../kde/apport-kde.py:207 +#: ../gtk/apport-gtk.py:257 +#, python-format +msgid "Package: %s" +msgstr "Package: %s" -#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357 -msgid "Launch a browser now" -msgstr "browser တစ်ခုကိုဖွင့်မည်" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 +#: ../debian/tmp/usr/share/apport/apport-kde.py:213 ../kde/apport-kde.py:213 +#: ../gtk/apport-gtk.py:264 +msgid "Sorry, a problem occurred while installing software." +msgstr "ဆောရီး၊ ဆော့ဝဲလ်သွင်းနေစဉ်ပြသာနာအနည်းငယ်ရှိသည်။" -#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 -msgid "No pending crash reports. Try --help for more information." +#: ../debian/tmp/usr/share/apport/apport-gtk.py:273 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 +#: ../debian/tmp/usr/share/apport/apport-kde.py:219 ../kde/apport-kde.py:219 +#: ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292 +#, python-format +msgid "The application %s has experienced an internal error." msgstr "" -#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 +#: ../debian/tmp/usr/share/apport/apport-kde.py:222 ../kde/apport-kde.py:222 +#: ../gtk/apport-gtk.py:276 +#, python-format +msgid "The application %s has closed unexpectedly." +msgstr "application %s သည်မမျှော်လင့်ပဲပိတ်သွားသည်" -#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "valgrind ကထုတ်လုပ်ဃဖိုင်အမည်ကိုသတ်မှတ်" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 ../kde/apport-kde.py:244 +#: ../gtk/apport-gtk.py:304 +msgid "Ignore future problems of this type" +msgstr "ဒီလိုအမျိုးအစားပြသာနာများကိုလစ်လျူရှုမည်" -#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46 -msgid "" -"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " -"create it" -msgstr "" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 +#: ../debian/tmp/usr/share/apport/apport-kde.py:288 ../kde/apport-kde.py:288 +#: ../gtk/apport-gtk.py:577 +msgid "Hide Details" +msgstr "အချက်အလက်များကို ဖျောက်ထားမည်" -#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50 -msgid "" -"do not create or reuse a sandbox directory for additional debug symbols " -"but rely only on installed debug symbols." +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" msgstr "" -#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54 +#: ../apport/com.ubuntu.apport.policy.in.h:2 msgid "" -"reuse a previously created cache dir (CDIR) or, if it does not exist, create " -"it" +"Authentication is required to collect system information for this problem " +"report" msgstr "" +"authentication ဤပြဿနာကိုအစီရင်ခံစာသည် system " +"သတင်းအချက်အလက်စုဆောင်းဖို့လိုအပ်သည်" -#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58 -msgid "" -"report download/install progress when installing packages into sandbox" -msgstr "" +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "System ကိုပြဿနာအစီရင်ခံစာများ" -#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62 +#: ../apport/com.ubuntu.apport.policy.in.h:4 msgid "" -"the executable that is run under valgrind's memcheck tool for memory leak " -"detection" -msgstr "" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97 -#, python-format -msgid "Error: %s is not an executable. Stopping." +"Please enter your password to access problem reports of system programs" msgstr "" +"မိမိကွန်ပျူတာ၏စနစ်ကိုပြဿနာအစီရင်ခံစာများဝင်ရောက်ကြည့်ရှုရန်သင့် password " +"ကိုရိုက်ထည့်ပေးပါ" #: ../debian/tmp/usr/share/apport/apport-kde.py:314 ../kde/apport-kde.py:314 msgid "Username:" @@ -1021,3 +870,163 @@ #: ../apport/ui.py:1379 msgid "This problem was already reported to developers. Thank you!" msgstr "ဒီပြသာနာကို developer များသို့ပို့ပြီးပါပြီ။ ကျေးဇူးတင်ရှိပါသည်။" + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +msgid "Do not put the new traces into the report, but write them to stdout." +msgstr "တင်ပြမှုတွင်လမ်းကြောင်းသစ်များမထည့်ပါနှင့် သို့သော် stdout တွင်ရေးပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 +msgid "" +"Start an interactive gdb session with the report's core dump (-o ignored; " +"does not rewrite report)" +msgstr "" +"gdb အပြန်အလှန်ကဏ္ဍကို တင်ပြမှုရဲ့ ပင်မအစုဖြင့်စတင်ပါ (-o လျစ်လျှူရှု; " +"တင်ပြမှုကိုပြန်လည်မရေးတော့ပါ)" + +#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 +msgid "" +"Write modified report to given file instead of changing the original report" +msgstr "မူလတင်ပြချက်ကို ပြင်မည့်အစား အသစ်ပြင်ထားသောတင်ပြချက်ကိုရေး၍ပေးပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +msgid "Remove the core dump from the report after stack trace regeneration" +msgstr "ခြေရာခံမှုထုတ်ပြန်ပြီးနောက် ပင်မပြဿနာအစုကို တင်ပြမှုမှဖယ်ထုတ်ပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +msgid "Override report's CoreFile" +msgstr "တင်ပြမှုရဲ့ အဓိကဖိုင်ကို ပြင်ရေးပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +msgid "Override report's ExecutablePath" +msgstr "တင်ပြမှုရဲ့ ခွင့်ပြုလမ်းကြောင်းကိုပြင်ရေးပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +msgid "Override report's ProcMaps" +msgstr "တင်ပြမှုရဲ့ ProcMaps ကိုပြင်ရေးပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +msgid "Rebuild report's Package information" +msgstr "တင်ပြမှုရဲ့ ပက်ကေ့ချ်အချက်အလက်ကို ပြန်တည်ဆောက်ပါ" + +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 +msgid "" +"Build a temporary sandbox and download/install the necessary packages and " +"debug symbols in there; without this option it assumes that the necessary " +"packages and debug symbols are already installed in the system. The argument " +"points to the packaging system configuration base directory; if you specify " +"\"system\", it will use the system configuration files, but will then only " +"be able to retrace crashes that happened on the currently running release." +msgstr "" +"ယာယီ ပေးပို့မှုတည်ဆောက်ပြီး လိုအပ်သော ပက်ကေ့ချ်များကို " +"ဆွဲချခြင်းတပ်ဆင်ခြင်းနှင့် အပြစ်တွေ့ရှိမှုရဲ့သင်္ကေတရှိနေမည်။ " +"ဤရွေးချယ်မှုမပါဝင်ပါကလိုအပ်သောပက်ကေ့ချ်များနှင့် " +"အပြစ်တွေ့ရှိမှုရဲ့သင်္ကေတများရှိပြီးသားဟုမှတ်ယူမည်။ပက်ကေ့ချ်စနစ်ရဲ့ပြုပြင်ပြီ" +"းသားအခြေခံလမ်းကြောင်းတွင်ရှိသော ထပ်ဖြည့်မှတ်များ၌ " +"အကယ်၍သင့်အနေဖြင့်စနစ်ဟုသတ်မှတ်လျှင် ၎င်းတို့သည် " +"စနစ်ရဲ့စီမံပြီးသားဖိုင်တွေကိုအသုံးပြုမည်။သို့သော် " +"ပျက်စီးမှုလမ်းကြောင်းများကိုသာသိနိုင်ပြီးယခုလက်ရှိထွက်ရှိမှုတွင်သာအကြုံးဝင်သည" +"်။" + +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 +msgid "" +"Report download/install progress when installing packages into sandbox" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +msgid "Prepend timestamps to log messages, for batch operation" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 +msgid "" +"Create and use third-party repositories from origins specified in reports" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +msgid "Cache directory for packages downloaded in the sandbox" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +msgid "" +"Directory for unpacked packages. Future runs will assume that any already " +"downloaded package is also extracted to this sandbox." +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:63 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-valgrind.py:66 +#: ../bin/apport-retrace.py:63 +msgid "" +"Install an extra package into the sandbox (can be specified multiple times)" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-retrace.py:65 +msgid "" +"Path to a file with the crash database authentication information. This is " +"used when specifying a crash ID to upload the retraced stack traces (only if " +"neither -g, -o, nor -s are specified)" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 +msgid "" +"Display retraced stack traces and ask for confirmation before sending them " +"to the crash database." +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +msgid "" +"Path to the duplicate sqlite database (default: no duplicate checking)" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-retrace.py:78 ../bin/apport-retrace.py:78 +msgid "You cannot use -C without -S. Stopping." +msgstr "" + +#. translators: don't translate y/n, apport currently only checks for "y" +#: ../debian/tmp/usr/bin/apport-retrace.py:111 ../bin/apport-retrace.py:111 +msgid "OK to send these as attachments? [y/n]" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37 +msgid "See man page for details." +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43 +msgid "specify the log file name produced by valgrind" +msgstr "valgrind ကထုတ်လုပ်ဃဖိုင်အမည်ကိုသတ်မှတ်" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46 +msgid "" +"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " +"create it" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50 +msgid "" +"do not create or reuse a sandbox directory for additional debug symbols " +"but rely only on installed debug symbols." +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54 +msgid "" +"reuse a previously created cache dir (CDIR) or, if it does not exist, create " +"it" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58 +msgid "" +"report download/install progress when installing packages into sandbox" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62 +msgid "" +"the executable that is run under valgrind's memcheck tool for memory leak " +"detection" +msgstr "" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97 +#, python-format +msgid "Error: %s is not an executable. Stopping." +msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/aptitude.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/aptitude.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/aptitude.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/aptitude.po 2016-04-15 08:51:12.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 11:14+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:48+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. TRANSLATORS: These strings describing config items #. should be the same width. diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apt-listchanges.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apt-listchanges.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apt-listchanges.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apt-listchanges.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:13+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:48+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../apt-listchanges.py:89 #, python-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apt.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apt.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apt.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apt.po 2016-04-15 08:51:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-03-15 19:05+0000\n" +"POT-Creation-Date: 2016-03-25 09:30+0100\n" "PO-Revision-Date: 2013-03-15 18:51+0000\n" "Last-Translator: Ye Htut Win \n" "Language-Team: Burmese \n" @@ -15,1407 +15,1792 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 11:13+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:47+0000\n" +"X-Generator: Launchpad (build 17995)\n" -#: cmdline/apt-cache.cc:141 +#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' +#: apt-private/acqprogress.cc #, c-format -msgid "Package %s version %s has an unmet dep:\n" -msgstr "ပက်ကေ့ချ် %s ဗားရှင်း %s unmet dep တခုရှိသည်\n" +msgid "Hit:%lu %s" +msgstr "" -#: cmdline/apt-cache.cc:245 -msgid "Total package names: " -msgstr "စုစုပေါင်းပက်ကေ့ချ်နာမည်များ " +#. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update' +#. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens +#: apt-private/acqprogress.cc +#, c-format +msgid "Get:%lu %s" +msgstr "" -#: cmdline/apt-cache.cc:286 -msgid "Total package structures: " -msgstr "စုစုပေါင်းပက်ကေ့ချ်တည်ဆောက်မှု " +#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' +#. which failed to download, but the error is ignored (compare "Err:") +#: apt-private/acqprogress.cc +#, c-format +msgid "Ign:%lu %s" +msgstr "" -#: cmdline/apt-cache.cc:285 -msgid " Normal packages: " -msgstr " ပုံမှန်ပက်ကေ့ချ် " +#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' +#. which failed to download and the error is critical (compare "Ign:") +#: apt-private/acqprogress.cc +#, c-format +msgid "Err:%lu %s" +msgstr "" -#: cmdline/apt-cache.cc:286 -msgid " Pure virtual packages: " -msgstr " စိတ်ကူးယဉ်ပက်ကေ့ချ်သီးသန့် " +#: apt-private/acqprogress.cc +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "" -#: cmdline/apt-cache.cc:287 -msgid " Single virtual packages: " -msgstr " စိတ်ကူးယဉ်ပက်ကေ့ချ်တခု " +#: apt-private/acqprogress.cc +msgid " [Working]" +msgstr "" -#: cmdline/apt-cache.cc:288 -msgid " Mixed virtual packages: " -msgstr " ရောထွေးနေသောစိတ်ကူးယဉ်ပက်ကေ့ချ် " +#: apt-private/acqprogress.cc +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press [Enter]\n" +msgstr "" -#: cmdline/apt-cache.cc:289 -msgid " Missing: " -msgstr " ပေျာက်နေသည် " +#: apt-private/private-cachefile.cc +msgid "Correcting dependencies..." +msgstr "" -#: cmdline/apt-cache.cc:291 -msgid "Total distinct versions: " -msgstr "အားလုံးကွဲပြားနေသောဗားရှင်းများ " +#: apt-private/private-cachefile.cc +msgid " failed." +msgstr "" -#: cmdline/apt-cache.cc:293 -msgid "Total distinct descriptions: " -msgstr "အားလုံးကွဲပြားနေသောဖော်ပြချက်များ " +#: apt-private/private-cachefile.cc +msgid "Unable to correct dependencies" +msgstr "" -#: cmdline/apt-cache.cc:295 -msgid "Total dependencies: " -msgstr "အမှီသဟဲများစုစုပေါင်း " +#: apt-private/private-cachefile.cc +msgid "Unable to minimize the upgrade set" +msgstr "" + +#: apt-private/private-cachefile.cc +msgid " Done" +msgstr "" + +#: apt-private/private-cachefile.cc +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "" + +#: apt-private/private-cachefile.cc +msgid "Unmet dependencies. Try using -f." +msgstr "" + +#: apt-private/private-cacheset.cc apt-private/private-search.cc +msgid "Sorting" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Note, selecting '%s' for glob '%s'\n" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Note, selecting '%s' for regex '%s'\n" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "" + +#: apt-private/private-cacheset.cc +msgid " [Installed]" +msgstr "" + +#: apt-private/private-cacheset.cc +msgid " [Not candidate version]" +msgstr "" + +#: apt-private/private-cacheset.cc +msgid "You should explicitly select one to install." +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" + +#: apt-private/private-cacheset.cc +msgid "However the following packages replace it:" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Package '%s' has no installation candidate" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Virtual packages like '%s' can't be removed\n" +msgstr "" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-cacheset.cc apt-private/private-install.cc +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" + +#: apt-private/private-cacheset.cc apt-private/private-install.cc +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "" + +#: apt-private/private-cacheset.cc +#, c-format +msgid "Note, selecting '%s' instead of '%s'\n" +msgstr "" + +#: apt-private/private-cmndline.cc +msgid "Most used commands:" +msgstr "" + +#: apt-private/private-cmndline.cc +#, c-format +msgid "See %s for more information about the available commands." +msgstr "" + +#: apt-private/private-cmndline.cc +msgid "" +"Configuration options and syntax is detailed in apt.conf(5).\n" +"Information about how to configure sources can be found in sources.list(5).\n" +"Package and version choices can be expressed via apt_preferences(5).\n" +"Security details are available in apt-secure(8).\n" +msgstr "" + +#: apt-private/private-cmndline.cc +msgid "This APT has Super Cow Powers." +msgstr "" + +#: apt-private/private-cmndline.cc +msgid "This APT helper has Super Meep Powers." +msgstr "" + +#: apt-private/private-depends.cc apt-private/private-show.cc +#: cmdline/apt-mark.cc +msgid "No packages found" +msgstr "ပက်ကေ့ချ်များရှာမတွေ့ပါ" + +#: apt-private/private-download.cc +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "" + +#: apt-private/private-download.cc +msgid "Authentication warning overridden.\n" +msgstr "" + +#: apt-private/private-download.cc +msgid "Some packages could not be authenticated" +msgstr "" + +#: apt-private/private-download.cc +msgid "Install these packages without verification?" +msgstr "" + +#: apt-private/private-download.cc apt-private/private-install.cc +msgid "" +"--force-yes is deprecated, use one of the options starting with --allow " +"instead." +msgstr "" + +#: apt-private/private-download.cc +msgid "" +"There were unauthenticated packages and -y was used without --allow-" +"unauthenticated" +msgstr "" + +#: apt-private/private-download.cc +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "" + +#: apt-private/private-download.cc +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "" + +#: apt-private/private-download.cc +#, c-format +msgid "You don't have enough free space in %s." +msgstr "" + +#: apt-private/private-download.cc +msgid "Unable to lock the download directory" +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << std::endl; +#. } +#. +#: apt-private/private-install.cc +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: apt-private/private-install.cc +msgid "Broken packages" +msgstr "" + +#: apt-private/private-install.cc +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" + +#: apt-private/private-install.cc +msgid "Packages need to be removed but remove is disabled." +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"Essential packages were removed and -y was used without --allow-remove-" +"essential." +msgstr "" + +#: apt-private/private-install.cc +msgid "Packages were downgraded and -y was used without --allow-downgrades." +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"Held packages were changed and -y was used without --allow-change-held-" +"packages." +msgstr "" + +#: apt-private/private-install.cc +msgid "Internal error, Ordering didn't finish" +msgstr "" + +#: apt-private/private-install.cc +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "" + +#: apt-private/private-install.cc +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" + +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: apt-private/private-install.cc +msgid "Yes, do as I say!" +msgstr "" + +#: apt-private/private-install.cc +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" + +#: apt-private/private-install.cc +msgid "Abort." +msgstr "" + +#: apt-private/private-install.cc +msgid "Do you want to continue?" +msgstr "" + +#: apt-private/private-install.cc +msgid "Some files failed to download" +msgstr "" + +#: apt-private/private-install.cc apt-private/private-source.cc +msgid "Download complete and in download only mode" +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" + +#: apt-private/private-install.cc +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" + +#: apt-private/private-install.cc +msgid "Unable to correct missing packages." +msgstr "" + +#: apt-private/private-install.cc +msgid "Aborting install." +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-install.cc +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "" + +#: apt-private/private-install.cc +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: apt-private/private-install.cc +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-install.cc +#, c-format +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-install.cc +#, c-format +msgid "Use '%s' to remove it." +msgid_plural "Use '%s' to remove them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-install.cc +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "" + +#: apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" + +#: apt-private/private-install.cc +msgid "The following additional packages will be installed:" +msgstr "" + +#: apt-private/private-install.cc +msgid "Suggested packages:" +msgstr "" + +#: apt-private/private-install.cc +msgid "Recommended packages:" +msgstr "" + +#: apt-private/private-install.cc +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" + +#: apt-private/private-install.cc +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: apt-private/private-install.cc +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" + +#. TRANSLATORS: First string is package name, second is version +#: apt-private/private-install.cc +#, c-format +msgid "%s is already the newest version (%s).\n" +msgstr "" + +#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc +#, c-format +msgid "%s set to manually installed.\n" +msgstr "" + +#: apt-private/private-install.cc +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "" + +#: apt-private/private-install.cc +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "" + +#: apt-private/private-list.cc +msgid "Listing" +msgstr "" + +#: apt-private/private-list.cc +#, c-format +msgid "There is %i additional version. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional versions. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-main.cc +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + +#: apt-private/private-output.cc apt-private/private-show.cc +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "[installed,upgradable to: %s]" +msgstr "" + +#: apt-private/private-output.cc +msgid "[installed,local]" +msgstr "" + +#: apt-private/private-output.cc +msgid "[installed,auto-removable]" +msgstr "" + +#: apt-private/private-output.cc +msgid "[installed,automatic]" +msgstr "" + +#: apt-private/private-output.cc +msgid "[installed]" +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "[upgradable from: %s]" +msgstr "" + +#: apt-private/private-output.cc +msgid "[residual-config]" +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "but %s is installed" +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "but %s is to be installed" +msgstr "" + +#: apt-private/private-output.cc +msgid "but it is not installable" +msgstr "" + +#: apt-private/private-output.cc +msgid "but it is a virtual package" +msgstr "" + +#: apt-private/private-output.cc +msgid "but it is not installed" +msgstr "" + +#: apt-private/private-output.cc +msgid "but it is not going to be installed" +msgstr "" + +#: apt-private/private-output.cc +msgid " or" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following packages have unmet dependencies:" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following NEW packages will be installed:" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following packages will be REMOVED:" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following packages have been kept back:" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following packages will be upgraded:" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following packages will be DOWNGRADED:" +msgstr "" + +#: apt-private/private-output.cc +msgid "The following held packages will be changed:" +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "%s (due to %s)" +msgstr "" + +#: apt-private/private-output.cc +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "%lu reinstalled, " +msgstr "" + +#: apt-private/private-output.cc +#, c-format +msgid "%lu downgraded, " +msgstr "" -#: cmdline/apt-cache.cc:298 -msgid "Total ver/file relations: " -msgstr "ver/ဖိုင် ဆက်နွယ်မှုများစုစုပေါင်း " +#: apt-private/private-output.cc +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "" -#: cmdline/apt-cache.cc:300 -msgid "Total Desc/File relations: " -msgstr "Desc/ဖိုင် ဆက်နွယ်မှုများစုစုပေါင်း " +#: apt-private/private-output.cc +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "" -#: cmdline/apt-cache.cc:302 -msgid "Total Provides mappings: " -msgstr "ထောက်ပံ့မှုများရဲ့လမ်းကြောင်းများစုစုပေါင်း " +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc +msgid "[y/N]" +msgstr "" -#: cmdline/apt-cache.cc:314 -msgid "Total globbed strings: " -msgstr "ပက်သတ်မှုရှိသောနောက်ဆက်တွဲစုစုပေါင်း " +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: apt-private/private-output.cc +msgid "Y" +msgstr "" -#: cmdline/apt-cache.cc:328 -msgid "Total dependency version space: " -msgstr "အမှီသဟဲရှိသောဗားရှင်းနေရာစုစုပေါင်း " +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: apt-private/private-output.cc +msgid "N" +msgstr "" -#: cmdline/apt-cache.cc:333 -msgid "Total slack space: " -msgstr "လျော့နေသောနေရာစုစုပေါင်း " +#: apt-private/private-output.cc +#, c-format +msgid "Regex compilation error - %s" +msgstr "" -#: cmdline/apt-cache.cc:341 -msgid "Total space accounted for: " -msgstr "ရေတွက်ခဲ့သောနေရာစုစုပေါင်းအတွက် " +#: apt-private/private-search.cc +msgid "You must give at least one search pattern" +msgstr "သင့်အနေဖြင့်ရှာဖွေရန် လမ်းစတခုတော့ပေးရမည်" -#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 +#: apt-private/private-search.cc +msgid "Full Text Search" +msgstr "" + +#: apt-private/private-show.cc cmdline/apt-cache.cc #, c-format msgid "Package file %s is out of sync." msgstr "ပက်ကေ့ချ်ဖိုင် %s သည်ချိန်ညိခြင်းရဲ့အပြင်တွင်ရှိနေသည်။" -#: cmdline/apt-cache.cc:1453 -msgid "No packages found" -msgstr "ပက်ကေ့ချ်များရှာမတွေ့ပါ" - -#: cmdline/apt-cache.cc:1221 -msgid "You must give at least one search pattern" -msgstr "သင့်အနေဖြင့်ရှာဖွေရန် လမ်းစတခုတော့ပေးရမည်" +#: apt-private/private-show.cc +#, c-format +msgid "There is %i additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" -#: cmdline/apt-cache.cc:1353 -msgid "This command is deprecated. Please use 'apt-mark showauto' instead." +#: apt-private/private-show.cc +msgid "not a real package (virtual)" msgstr "" -"ယခုကွန်မန်းသည်ကန့်ကွက်ထားပြီးသား။ကျေးဇူးပြု၍ 'apt-mark showauto' " -"ကိုသုံးပေးပါ။" -#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 -#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 -#: cmdline/apt-cache.cc:1425 cmdline/apt-cache.cc:1577 +#: apt-private/private-show.cc #, c-format msgid "Unable to locate package %s" msgstr "ပက်ကေ့ချ်ရဲ့နေရာကိုရှာမတွေ့ပါ %s" -#: cmdline/apt-cache.cc:1530 +#: apt-private/private-show.cc msgid "Package files:" msgstr "ပက်ကေ့ချ်ဖိုင်များ" -#: cmdline/apt-cache.cc:1537 cmdline/apt-cache.cc:1624 +#: apt-private/private-show.cc msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "မှတ်သားမှုလမ်းကြောင်းသည် ချိန်ညိ၍မရပါ။x-ref ပက်ကေ့ချ်ဖိုင်မဖြစ်နိုင်ပါ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1551 +#: apt-private/private-show.cc msgid "Pinned packages:" msgstr "မှတ်ခဲ့သောပက်ကေ့ချ်များ" -#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1604 +#: apt-private/private-show.cc msgid "(not found)" msgstr "(မတွေ့ပါ)" -#. Installed version -#: cmdline/apt-cache.cc:1584 +#. Print the package name and the version we are forcing to +#: apt-private/private-show.cc +#, c-format +msgid "%s -> %s with priority %d\n" +msgstr "" + +#: apt-private/private-show.cc msgid " Installed: " msgstr " တပ်ပြီးပြီ " -#. Candidate Version -#: cmdline/apt-cache.cc:1591 +#: apt-private/private-show.cc msgid " Candidate: " msgstr " ရွေးပြီးသား " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: apt-private/private-show.cc msgid "(none)" msgstr "(ဘာမျှမရှိ)" -#: cmdline/apt-cache.cc:1601 +#: apt-private/private-show.cc msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: apt-private/private-show.cc msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1720 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:588 -#: cmdline/apt-get.cc:2739 cmdline/apt-sortpkgs.cc:144 +#: apt-private/private-source.cc #, c-format -msgid "%s %s for %s compiled on %s %s\n" +msgid "Can not find a package for architecture '%s'" msgstr "" -#: cmdline/apt-cache.cc:1682 -msgid "" -"Usage: apt-cache [options] command\n" -" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -"\n" -"apt-cache is a low-level tool used to query information\n" -"from APT's binary cache files\n" -"\n" -"Commands:\n" -" gencaches - Build both the package and source cache\n" -" showpkg - Show some general information for a single package\n" -" showsrc - Show source records\n" -" stats - Show some basic statistics\n" -" dump - Show the entire file in a terse form\n" -" dumpavail - Print an available file to stdout\n" -" unmet - Show unmet dependencies\n" -" search - Search the package list for a regex pattern\n" -" show - Show a readable record for the package\n" -" depends - Show raw dependency information for a package\n" -" rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages in the system\n" -" dotty - Generate package graphs for GraphViz\n" -" xvcg - Generate package graphs for xvcg\n" -" policy - Show policy settings\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -p=? The package cache.\n" -" -s=? The source cache.\n" -" -q Disable progress indicator.\n" -" -i Show only important deps for the unmet command.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +#: apt-private/private-source.cc +#, c-format +msgid "Can not find a package '%s' with version '%s'" msgstr "" -#: cmdline/apt-cdrom.cc:77 -msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" +#: apt-private/private-source.cc +#, c-format +msgid "Can not find a package '%s' with release '%s'" msgstr "" -#: cmdline/apt-cdrom.cc:92 -msgid "Please insert a Disc in the drive and press enter" +#: apt-private/private-source.cc +#, c-format +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-cdrom.cc:127 +#: apt-private/private-source.cc #, c-format -msgid "Failed to mount '%s' to '%s'" +msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-cdrom.cc:162 -msgid "Repeat this process for the rest of the CDs in your set." +#: apt-private/private-source.cc +msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-config.cc:41 -msgid "Arguments not in pairs" +#: apt-private/private-source.cc +#, c-format +msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-config.cc:76 +#: apt-private/private-source.cc +#, c-format msgid "" -"Usage: apt-config [options] command\n" -"\n" -"apt-config is a simple tool to read the APT config file\n" -"\n" -"Commands:\n" -" shell - Shell mode\n" -" dump - Show the configuration\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:98 +#: apt-private/private-source.cc #, c-format -msgid "%s not a valid DEB package." -msgstr "" - -#: cmdline/apt-extracttemplates.cc:232 msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"Please use:\n" +"%s\n" +"to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 +#: apt-private/private-source.cc #, c-format -msgid "Unable to write to %s" +msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:310 -msgid "Cannot get debconf version. Is debconf installed?" +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-source.cc +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:346 -msgid "Package extension list is too long" +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-source.cc +#, c-format +msgid "Need to get %sB of source archives.\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:188 -#: ftparchive/apt-ftparchive.cc:211 ftparchive/apt-ftparchive.cc:261 -#: ftparchive/apt-ftparchive.cc:275 ftparchive/apt-ftparchive.cc:297 +#: apt-private/private-source.cc #, c-format -msgid "Error processing directory %s" +msgid "Fetch source %s\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:259 -msgid "Source extension list is too long" +#: apt-private/private-source.cc +msgid "Failed to fetch some archives." msgstr "" -#: ftparchive/apt-ftparchive.cc:376 -msgid "Error writing header to contents file" +#: apt-private/private-source.cc +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:406 +#: apt-private/private-source.cc #, c-format -msgid "Error processing contents %s" +msgid "Unpack command '%s' failed.\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:594 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +#: apt-private/private-source.cc +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:800 -msgid "No selections matched" +#: apt-private/private-source.cc +#, c-format +msgid "Build command '%s' failed.\n" msgstr "" -#: ftparchive/apt-ftparchive.cc:878 +#: apt-private/private-source.cc #, c-format -msgid "Some files are missing in the package file group `%s'" +msgid "Unable to get build-dependency information for %s" msgstr "" -#: ftparchive/cachedb.cc:43 +#: apt-private/private-source.cc #, c-format -msgid "DB was corrupted, file renamed to %s.old" +msgid "%s has no build depends.\n" msgstr "" -#: ftparchive/cachedb.cc:61 -#, c-format -msgid "DB is old, attempting to upgrade %s" +#: apt-private/private-source.cc +msgid "Must specify at least one package to check builddeps for" msgstr "" -#: ftparchive/cachedb.cc:72 +#: apt-private/private-source.cc +#, c-format msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +"No architecture information available for %s. See apt.conf(5) " +"APT::Architectures for setup" msgstr "" -#: ftparchive/cachedb.cc:77 +#: apt-private/private-source.cc #, c-format -msgid "Unable to open DB file %s: %s" +msgid "Note, using directory '%s' to get the build dependencies\n" msgstr "" -#: ftparchive/cachedb.cc:123 +#: apt-private/private-source.cc #, c-format -msgid "Failed to stat %s" +msgid "Note, using file '%s' to get the build dependencies\n" msgstr "" -#: ftparchive/cachedb.cc:238 -msgid "Archive has no control record" +#: apt-private/private-source.cc +msgid "Failed to process build dependencies" msgstr "" -#: ftparchive/cachedb.cc:444 -msgid "Unable to get a cursor" +#: apt-private/private-sources.cc +#, c-format +msgid "Failed to parse %s. Edit again? " msgstr "" -#: ftparchive/writer.cc:73 +#: apt-private/private-sources.cc #, c-format -msgid "W: Unable to read directory %s\n" +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: ftparchive/writer.cc:78 +#: apt-private/private-unmet.cc #, c-format -msgid "W: Unable to stat %s\n" -msgstr "" +msgid "Package %s version %s has an unmet dep:\n" +msgstr "ပက်ကေ့ချ် %s ဗားရှင်း %s unmet dep တခုရှိသည်\n" -#: ftparchive/writer.cc:134 -msgid "E: " +#: apt-private/private-update.cc +msgid "The update command takes no arguments" msgstr "" -#: ftparchive/writer.cc:136 -msgid "W: " -msgstr "" +#: apt-private/private-update.cc +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" -#: ftparchive/writer.cc:143 -msgid "E: Errors apply to file " +#: apt-private/private-update.cc +msgid "All packages are up to date." msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 -#, c-format -msgid "Failed to resolve %s" +#: cmdline/apt-cache.cc +msgid "apt-cache stats does not take any arguments" msgstr "" -#: ftparchive/writer.cc:174 -msgid "Tree walking failed" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total package names: " +msgstr "စုစုပေါင်းပက်ကေ့ချ်နာမည်များ " -#: ftparchive/writer.cc:201 -#, c-format -msgid "Failed to open %s" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total package structures: " +msgstr "စုစုပေါင်းပက်ကေ့ချ်တည်ဆောက်မှု " -#: ftparchive/writer.cc:260 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr "" +#: cmdline/apt-cache.cc +msgid " Normal packages: " +msgstr " ပုံမှန်ပက်ကေ့ချ် " -#: ftparchive/writer.cc:268 -#, c-format -msgid "Failed to readlink %s" -msgstr "" +#: cmdline/apt-cache.cc +msgid " Pure virtual packages: " +msgstr " စိတ်ကူးယဉ်ပက်ကေ့ချ်သီးသန့် " -#: ftparchive/writer.cc:272 -#, c-format -msgid "Failed to unlink %s" -msgstr "" +#: cmdline/apt-cache.cc +msgid " Single virtual packages: " +msgstr " စိတ်ကူးယဉ်ပက်ကေ့ချ်တခု " -#: ftparchive/writer.cc:279 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "" +#: cmdline/apt-cache.cc +msgid " Mixed virtual packages: " +msgstr " ရောထွေးနေသောစိတ်ကူးယဉ်ပက်ကေ့ချ် " -#: ftparchive/writer.cc:289 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "" +#: cmdline/apt-cache.cc +msgid " Missing: " +msgstr " ပေျာက်နေသည် " -#: ftparchive/writer.cc:392 -msgid "Archive had no package field" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total distinct versions: " +msgstr "အားလုံးကွဲပြားနေသောဗားရှင်းများ " -#: ftparchive/writer.cc:400 ftparchive/writer.cc:687 -#, c-format -msgid " %s has no override entry\n" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total distinct descriptions: " +msgstr "အားလုံးကွဲပြားနေသောဖော်ပြချက်များ " -#: ftparchive/writer.cc:463 ftparchive/writer.cc:790 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total dependencies: " +msgstr "အမှီသဟဲများစုစုပေါင်း " -#: ftparchive/writer.cc:697 -#, c-format -msgid " %s has no source override entry\n" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total ver/file relations: " +msgstr "ver/ဖိုင် ဆက်နွယ်မှုများစုစုပေါင်း " -#: ftparchive/writer.cc:701 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total Desc/File relations: " +msgstr "Desc/ဖိုင် ဆက်နွယ်မှုများစုစုပေါင်း " -#: ftparchive/contents.cc:362 ftparchive/contents.cc:393 -msgid "realloc - Failed to allocate memory" -msgstr "" +#: cmdline/apt-cache.cc +msgid "Total Provides mappings: " +msgstr "ထောက်ပံ့မှုများရဲ့လမ်းကြောင်းများစုစုပေါင်း " -#: ftparchive/override.cc:34 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" +#: cmdline/apt-cache.cc +msgid "Total globbed strings: " +msgstr "ပက်သတ်မှုရှိသောနောက်ဆက်တွဲစုစုပေါင်း " + +#: cmdline/apt-cache.cc +msgid "Total slack space: " +msgstr "လျော့နေသောနေရာစုစုပေါင်း " + +#: cmdline/apt-cache.cc +msgid "Total space accounted for: " +msgstr "ရေတွက်ခဲ့သောနေရာစုစုပေါင်းအတွက် " + +#: cmdline/apt-cache.cc +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" +"ယခုကွန်မန်းသည်ကန့်ကွက်ထားပြီးသား။ကျေးဇူးပြု၍ 'apt-mark showauto' " +"ကိုသုံးပေးပါ။" -#: ftparchive/override.cc:60 ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" +#: cmdline/apt-cache.cc +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] show pkg1 [pkg2 ...]\n" +"\n" +"apt-cache queries and displays available information about installed\n" +"and installable packages. It works exclusively on the data acquired\n" +"into the local cache via the 'update' command of e.g. apt-get. The\n" +"displayed information may therefore be outdated if the last update was\n" +"too long ago, but in exchange apt-cache works independently of the\n" +"availability of the configured sources (e.g. offline).\n" msgstr "" -#: ftparchive/override.cc:74 ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" +#: cmdline/apt-cache.cc +msgid "Show source records" msgstr "" -#: ftparchive/override.cc:88 ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" +#: cmdline/apt-cache.cc +msgid "Search the package list for a regex pattern" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" +#: cmdline/apt-cache.cc +msgid "Show raw dependency information for a package" msgstr "" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" +#: cmdline/apt-cache.cc +msgid "Show reverse dependency information for a package" msgstr "" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" +#: cmdline/apt-cache.cc +msgid "Show a readable record for the package" msgstr "" -#: ftparchive/multicompress.cc:170 -msgid "Failed to create IPC pipe to subprocess" +#: cmdline/apt-cache.cc +msgid "List the names of all packages in the system" msgstr "" -#: ftparchive/multicompress.cc:196 -msgid "Failed to create FILE*" +#: cmdline/apt-cache.cc +msgid "Show policy settings" msgstr "" -#: ftparchive/multicompress.cc:199 -msgid "Failed to fork" +#: cmdline/apt-cdrom.cc +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: ftparchive/multicompress.cc:213 -msgid "Compress child" +#: cmdline/apt-cdrom.cc +msgid "Please insert a Disc in the drive and press [Enter]" msgstr "" -#: ftparchive/multicompress.cc:236 +#: cmdline/apt-cdrom.cc #, c-format -msgid "Internal error, failed to create %s" +msgid "Failed to mount '%s' to '%s'" msgstr "" -#: ftparchive/multicompress.cc:404 -msgid "IO to subprocess/file failed" +#: cmdline/apt-cdrom.cc +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." msgstr "" -#: ftparchive/multicompress.cc:456 -msgid "Failed to read while computing MD5" +#: cmdline/apt-cdrom.cc +msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -#: ftparchive/multicompress.cc:473 -#, c-format -msgid "Problem unlinking %s" +#: cmdline/apt-cdrom.cc +msgid "" +"Usage: apt-cdrom [options] command\n" +"\n" +"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n" +"media types as package sources to APT. The mount point and device\n" +"information is taken from apt.conf(5), udev(7) and fstab(5).\n" msgstr "" -#: ftparchive/multicompress.cc:488 -#, c-format -msgid "Failed to rename %s to %s" +#: cmdline/apt-config.cc +msgid "Arguments not in pairs" msgstr "" -#: cmdline/apt-get.cc:127 -msgid "Y" +#: cmdline/apt-config.cc +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is an interface to the configuration settings used by\n" +"all APT tools, mainly intended for debugging and shell scripting.\n" msgstr "" -#: cmdline/apt-get.cc:140 -msgid "N" +#: cmdline/apt-config.cc +msgid "get configuration values via shell evaluation" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1763 -#, c-format -msgid "Regex compilation error - %s" +#: cmdline/apt-config.cc +msgid "show the active configuration setting" msgstr "" -#: cmdline/apt-get.cc:244 -msgid "The following packages have unmet dependencies:" +#: cmdline/apt-get.cc +#, c-format +msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc cmdline/apt-mark.cc #, c-format -msgid "but %s is installed" +msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:336 -#, c-format -msgid "but %s is to be installed" +#: cmdline/apt-get.cc cmdline/apt-mark.cc +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." msgstr "" -#: cmdline/apt-get.cc:343 -msgid "but it is not installable" +#: cmdline/apt-get.cc +msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:345 -msgid "but it is a virtual package" +#: cmdline/apt-get.cc +msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:348 -msgid "but it is not installed" +#: cmdline/apt-get.cc +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a command line interface for retrieval of packages\n" +"and information about them from authenticated sources and\n" +"for installation, upgrade and removal of packages together\n" +"with their dependencies.\n" msgstr "" -#: cmdline/apt-get.cc:348 -msgid "but it is not going to be installed" +#: cmdline/apt-get.cc +msgid "Retrieve new lists of packages" msgstr "" -#: cmdline/apt-get.cc:353 -msgid " or" +#: cmdline/apt-get.cc +msgid "Perform an upgrade" msgstr "" -#: cmdline/apt-get.cc:382 -msgid "The following NEW packages will be installed:" +#: cmdline/apt-get.cc +msgid "Install new packages (pkg is libc6 not libc6.deb)" msgstr "" -#: cmdline/apt-get.cc:408 -msgid "The following packages will be REMOVED:" +#: cmdline/apt-get.cc +msgid "Remove packages" msgstr "" -#: cmdline/apt-get.cc:430 -msgid "The following packages have been kept back:" +#: cmdline/apt-get.cc +msgid "Remove packages and config files" msgstr "" -#: cmdline/apt-get.cc:451 -msgid "The following packages will be upgraded:" +#: cmdline/apt-get.cc cmdline/apt.cc +msgid "Remove automatically all unused packages" msgstr "" -#: cmdline/apt-get.cc:472 -msgid "The following packages will be DOWNGRADED:" +#: cmdline/apt-get.cc +msgid "Distribution upgrade, see apt-get(8)" msgstr "" -#: cmdline/apt-get.cc:492 -msgid "The following held packages will be changed:" +#: cmdline/apt-get.cc +msgid "Follow dselect selections" msgstr "" -#: cmdline/apt-get.cc:545 -#, c-format -msgid "%s (due to %s) " +#: cmdline/apt-get.cc +msgid "Configure build-dependencies for source packages" msgstr "" -#: cmdline/apt-get.cc:553 -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +#: cmdline/apt-get.cc +msgid "Erase downloaded archive files" msgstr "" -#: cmdline/apt-get.cc:584 -#, c-format -msgid "%lu upgraded, %lu newly installed, " +#: cmdline/apt-get.cc +msgid "Erase old downloaded archive files" msgstr "" -#: cmdline/apt-get.cc:588 -#, c-format -msgid "%lu reinstalled, " +#: cmdline/apt-get.cc +msgid "Verify that there are no broken dependencies" msgstr "" -#: cmdline/apt-get.cc:590 -#, c-format -msgid "%lu downgraded, " +#: cmdline/apt-get.cc +msgid "Download source archives" msgstr "" -#: cmdline/apt-get.cc:592 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" +#: cmdline/apt-get.cc +msgid "Download the binary package into the current directory" msgstr "" -#: cmdline/apt-get.cc:596 -#, c-format -msgid "%lu not fully installed or removed.\n" +#: cmdline/apt-get.cc +msgid "Download and display the changelog for the given package" msgstr "" -#: cmdline/apt-get.cc:628 -#, c-format -msgid "Note, selecting '%s' for task '%s'\n" +#: cmdline/apt-helper.cc +msgid "Need one URL as argument" msgstr "" -#: cmdline/apt-get.cc:634 -#, c-format -msgid "Note, selecting '%s' for regex '%s'\n" +#: cmdline/apt-helper.cc +msgid "Must specify at least one pair url/filename" +msgstr "" + +#: cmdline/apt-helper.cc +msgid "Download Failed" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-helper.cc #, c-format -msgid "Package %s is a virtual package provided by:\n" +msgid "GetSrvRec failed for %s" msgstr "" -#: cmdline/apt-get.cc:1145 -msgid " [Installed]" +#: cmdline/apt-helper.cc +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] cat-file file ...\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper bundles a variety of commands for shell scripts to use\n" +"e.g. the same proxy configuration or acquire system as APT would.\n" msgstr "" -#: cmdline/apt-get.cc:671 -msgid " [Not candidate version]" +#: cmdline/apt-helper.cc +msgid "download the given uri to the target-path" msgstr "" -#: cmdline/apt-get.cc:1150 -msgid "You should explicitly select one to install." +#: cmdline/apt-helper.cc +msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" msgstr "" -#: cmdline/apt-get.cc:1155 -#, c-format -msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" +#: cmdline/apt-helper.cc +msgid "concatenate files, with automatic decompression" msgstr "" -#: cmdline/apt-get.cc:1174 -msgid "However the following packages replace it:" +#: cmdline/apt-helper.cc +msgid "detect proxy using apt.conf" msgstr "" -#: cmdline/apt-get.cc:706 +#: cmdline/apt-mark.cc #, c-format -msgid "Package '%s' has no installation candidate" +msgid "%s can not be marked as it is not installed.\n" msgstr "" -#: cmdline/apt-get.cc:717 +#: cmdline/apt-mark.cc #, c-format -msgid "Virtual packages like '%s' can't be removed\n" +msgid "%s was already set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:748 +#: cmdline/apt-mark.cc #, c-format -msgid "Note, selecting '%s' instead of '%s'\n" +msgid "%s was already set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-mark.cc #, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgid "%s was already set on hold.\n" msgstr "" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-mark.cc #, c-format -msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgid "%s was already not hold.\n" msgstr "" -#: cmdline/apt-get.cc:1197 -#, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +#: cmdline/apt-mark.cc +msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-get.cc:1205 +#: cmdline/apt-mark.cc #, c-format -msgid "%s is already the newest version.\n" +msgid "%s set on hold.\n" msgstr "" -#: cmdline/apt-get.cc:1805 +#: cmdline/apt-mark.cc #, c-format -msgid "%s set to manually installed.\n" +msgid "Canceled hold on %s.\n" msgstr "" -#: cmdline/apt-get.cc:844 +#: cmdline/apt-mark.cc #, c-format -msgid "Selected version '%s' (%s) for '%s'\n" +msgid "Selected %s for purge.\n" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-mark.cc #, c-format -msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgid "Selected %s for removal.\n" msgstr "" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-mark.cc #, c-format -msgid "Package %s is not installed, so not removed\n" +msgid "Selected %s for installation.\n" msgstr "" -#: cmdline/apt-get.cc:669 -msgid "Correcting dependencies..." +#: cmdline/apt-mark.cc +msgid "" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manually or automatically installed. It can also be used to\n" +"manipulate the dpkg(1) selection states of packages, and to list\n" +"all packages with or without a certain marking.\n" msgstr "" -#: cmdline/apt-get.cc:672 -msgid " failed." +#: cmdline/apt-mark.cc +msgid "Mark the given packages as automatically installed" msgstr "" -#: cmdline/apt-get.cc:675 -msgid "Unable to correct dependencies" +#: cmdline/apt-mark.cc +msgid "Mark the given packages as manually installed" msgstr "" -#: cmdline/apt-get.cc:678 -msgid "Unable to minimize the upgrade set" +#: cmdline/apt-mark.cc +msgid "Mark a package as held back" msgstr "" -#: cmdline/apt-get.cc:680 -msgid " Done" +#: cmdline/apt-mark.cc +msgid "Unset a package set as held back" msgstr "" -#: cmdline/apt-get.cc:986 -msgid "You might want to run 'apt-get -f install' to correct these." +#: cmdline/apt-mark.cc +msgid "Print the list of automatically installed packages" msgstr "" -#: cmdline/apt-get.cc:687 -msgid "Unmet dependencies. Try using -f." +#: cmdline/apt-mark.cc +msgid "Print the list of manually installed packages" msgstr "" -#: cmdline/apt-get.cc:695 -msgid "WARNING: The following packages cannot be authenticated!" +#: cmdline/apt-mark.cc +msgid "Print the list of package on hold" msgstr "" -#: cmdline/apt-get.cc:699 -msgid "Authentication warning overridden.\n" +#: cmdline/apt.cc +msgid "" +"Usage: apt [options] command\n" +"\n" +"apt is a commandline package manager and provides commands for\n" +"searching and managing as well as querying information about packages.\n" +"It provides the same functionality as the specialized APT tools,\n" +"like apt-get and apt-cache, but enables options more suitable for\n" +"interactive use by default.\n" msgstr "" -#: cmdline/apt-get.cc:709 -msgid "Install these packages without verification [y/N]? " +#. query +#: cmdline/apt.cc +msgid "list packages based on package names" msgstr "" -#: cmdline/apt-get.cc:704 cmdline/apt-get.cc:711 -msgid "Some packages could not be authenticated" +#: cmdline/apt.cc +msgid "search in package descriptions" msgstr "" -#: cmdline/apt-get.cc:720 cmdline/apt-get.cc:897 -msgid "There are problems and -y was used without --force-yes" +#: cmdline/apt.cc +msgid "show package details" msgstr "" -#: cmdline/apt-get.cc:782 -msgid "Internal error, InstallPackages was called with broken packages!" +#. package stuff +#: cmdline/apt.cc +msgid "install packages" msgstr "" -#: cmdline/apt-get.cc:791 -msgid "Packages need to be removed but remove is disabled." +#: cmdline/apt.cc +msgid "remove packages" msgstr "" -#: cmdline/apt-get.cc:802 -msgid "Internal error, Ordering didn't finish" +#. system wide stuff +#: cmdline/apt.cc +msgid "update list of available packages" msgstr "" -#: cmdline/apt-get.cc:843 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +#: cmdline/apt.cc +msgid "upgrade the system by installing/upgrading packages" msgstr "" -#: cmdline/apt-get.cc:848 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" +#: cmdline/apt.cc +msgid "upgrade the system by removing/installing/upgrading packages" msgstr "" -#: cmdline/apt-get.cc:851 -#, c-format -msgid "Need to get %sB of archives.\n" +#. misc +#: cmdline/apt.cc +msgid "edit the source information file" msgstr "" -#: cmdline/apt-get.cc:856 +#: methods/cdrom.cc #, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" +msgid "Unable to read the cdrom database %s" msgstr "" -#: cmdline/apt-get.cc:859 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" +#: methods/cdrom.cc +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:877 cmdline/apt-get.cc:2319 -#: cmdline/apt-get.cc:2322 -#, c-format -msgid "Couldn't determine free space in %s" +#: methods/cdrom.cc +msgid "Wrong CD-ROM" msgstr "" -#: cmdline/apt-get.cc:887 +#: methods/cdrom.cc #, c-format -msgid "You don't have enough free space in %s." +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: cmdline/apt-get.cc:903 cmdline/apt-get.cc:923 -msgid "Trivial Only specified but this is not a trivial operation." +#: methods/cdrom.cc +msgid "Disk not found." msgstr "" -#: cmdline/apt-get.cc:905 -msgid "Yes, do as I say!" +#: methods/cdrom.cc methods/file.cc methods/rsh.cc +msgid "File not found" msgstr "" -#: cmdline/apt-get.cc:907 +#: methods/connect.cc #, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" - -#: cmdline/apt-get.cc:913 cmdline/apt-get.cc:932 -msgid "Abort." +msgid "Connecting to %s (%s)" msgstr "" -#: cmdline/apt-get.cc:928 -msgid "Do you want to continue [Y/n]? " +#: methods/connect.cc +#, c-format +msgid "[IP: %s %s]" msgstr "" -#: cmdline/apt-get.cc:1000 cmdline/apt-get.cc:2375 +#: methods/connect.cc #, c-format -msgid "Failed to fetch %s %s\n" +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: cmdline/apt-get.cc:1018 -msgid "Some files failed to download" +#: methods/connect.cc +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: cmdline/apt-get.cc:1019 cmdline/apt-get.cc:2384 -msgid "Download complete and in download only mode" +#: methods/connect.cc +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: cmdline/apt-get.cc:1025 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +#: methods/connect.cc methods/ftp.cc methods/rsh.cc +msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1029 -msgid "--fix-missing and media swapping is not currently supported" +#: methods/connect.cc +#, c-format +msgid "Could not connect to %s:%s (%s)." msgstr "" -#: cmdline/apt-get.cc:1034 -msgid "Unable to correct missing packages." +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc methods/rsh.cc +#, c-format +msgid "Connecting to %s" msgstr "" -#: cmdline/apt-get.cc:1035 -msgid "Aborting install." +#: methods/connect.cc +#, c-format +msgid "Could not resolve '%s'" msgstr "" -#: cmdline/apt-get.cc:1363 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1367 -msgid "Note: This is done automatic and on purpose by dpkg." +#: methods/connect.cc +#, c-format +msgid "Temporary failure resolving '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: methods/connect.cc #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "System error resolving '%s:%s'" msgstr "" -#: cmdline/apt-get.cc:1374 +#: methods/connect.cc #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1412 +#: methods/connect.cc #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Unable to connect to %s:%s:" msgstr "" -#: cmdline/apt-get.cc:1428 -msgid "The update command takes no arguments" +#: methods/copy.cc methods/store.cc +msgid "Failed to stat" msgstr "" -#: cmdline/apt-get.cc:1497 -msgid "We are not supposed to delete stuff, can't start AutoRemover" +#: methods/copy.cc methods/rred.cc methods/store.cc +msgid "Failed to set modification time" msgstr "" -#: cmdline/apt-get.cc:1554 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +#: methods/file.cc +msgid "Invalid URI, local URIS must not start with //" msgstr "" -#. -#. if (Packages == 1) -#. { -#. c1out << endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << endl; -#. } -#. -#: cmdline/apt-get.cc:1557 cmdline/apt-get.cc:1848 -msgid "The following information may help to resolve the situation:" +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc +msgid "Logging in" msgstr "" -#: cmdline/apt-get.cc:1561 -msgid "Internal Error, AutoRemover broke stuff" +#: methods/ftp.cc +msgid "Unable to determine the peer name" msgstr "" -#: cmdline/apt-get.cc:1754 -msgid "" -"The following package was automatically installed and is no longer required:" -msgid_plural "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1758 -#, c-format -msgid "%lu package was automatically installed and is no longer required.\n" -msgid_plural "" -"%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1549 -msgid "Use 'apt-get autoremove' to remove them." +#: methods/ftp.cc +msgid "Unable to determine the local name" msgstr "" -#: cmdline/apt-get.cc:1580 -msgid "Internal error, AllUpgrade broke stuff" +#: methods/ftp.cc +#, c-format +msgid "The server refused the connection and said: %s" msgstr "" -#: cmdline/apt-get.cc:1878 -msgid "You might want to run 'apt-get -f install' to correct these:" +#: methods/ftp.cc +#, c-format +msgid "USER failed, server said: %s" msgstr "" -#: cmdline/apt-get.cc:1821 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." +#: methods/ftp.cc +#, c-format +msgid "PASS failed, server said: %s" msgstr "" -#: cmdline/apt-get.cc:1833 +#: methods/ftp.cc msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." msgstr "" -#: cmdline/apt-get.cc:1851 -msgid "Broken packages" +#: methods/ftp.cc +#, c-format +msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: cmdline/apt-get.cc:1880 -msgid "The following extra packages will be installed:" +#: methods/ftp.cc +#, c-format +msgid "TYPE failed, server said: %s" msgstr "" -#: cmdline/apt-get.cc:1969 -msgid "Suggested packages:" +#: methods/ftp.cc methods/rsh.cc +msgid "Connection timeout" msgstr "" -#: cmdline/apt-get.cc:1970 -msgid "Recommended packages:" +#: methods/ftp.cc +msgid "Server closed the connection" msgstr "" -#: cmdline/apt-get.cc:1750 cmdline/apt-get.cc:1786 -#, c-format -msgid "Couldn't find package %s" +#: methods/ftp.cc methods/rsh.cc +msgid "Read error" msgstr "" -#: cmdline/apt-get.cc:2082 -#, c-format -msgid "%s set to automatically installed.\n" +#: methods/ftp.cc methods/rsh.cc +msgid "A response overflowed the buffer." msgstr "" -#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:105 -msgid "" -"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " -"instead." +#: methods/ftp.cc +msgid "Protocol corruption" msgstr "" -#: cmdline/apt-get.cc:1999 -msgid "Calculating upgrade... " +#: methods/ftp.cc methods/rsh.cc +msgid "Write error" msgstr "" -#: cmdline/apt-get.cc:2002 -msgid "Failed" +#: methods/ftp.cc +msgid "Could not create a socket" msgstr "" -#: cmdline/apt-get.cc:2007 -msgid "Done" +#: methods/ftp.cc +msgid "Could not connect data socket, connection timed out" msgstr "" -#: cmdline/apt-get.cc:2074 cmdline/apt-get.cc:2082 -msgid "Internal error, problem resolver broke stuff" +#: methods/ftp.cc +msgid "Could not connect passive socket." msgstr "" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2106 cmdline/apt-get.cc:2139 -msgid "Unable to lock the download directory" +#: methods/ftp.cc +msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: cmdline/apt-get.cc:2294 -#, c-format -msgid "Downloading %s %s" +#: methods/ftp.cc +msgid "Could not bind a socket" msgstr "" -#: cmdline/apt-get.cc:2182 -msgid "Must specify at least one package to fetch source for" +#: methods/ftp.cc +msgid "Could not listen on the socket" msgstr "" -#: cmdline/apt-get.cc:2213 cmdline/apt-get.cc:2498 -#, c-format -msgid "Unable to find a source package for %s" +#: methods/ftp.cc +msgid "Could not determine the socket's name" msgstr "" -#: cmdline/apt-get.cc:2232 -#, c-format -msgid "" -"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" -"%s\n" +#: methods/ftp.cc +msgid "Unable to send PORT command" msgstr "" -#: cmdline/apt-get.cc:2443 +#: methods/ftp.cc #, c-format -msgid "" -"Please use:\n" -"bzr branch %s\n" -"to retrieve the latest (possibly unreleased) updates to the package.\n" +msgid "Unknown address family %u (AF_*)" msgstr "" -#: cmdline/apt-get.cc:2292 +#: methods/ftp.cc #, c-format -msgid "Skipping already downloaded file '%s'\n" +msgid "EPRT failed, server said: %s" msgstr "" -#: cmdline/apt-get.cc:2332 -#, c-format -msgid "You don't have enough free space in %s" +#: methods/ftp.cc +msgid "Data socket connect timed out" msgstr "" -#: cmdline/apt-get.cc:2338 -#, c-format -msgid "Need to get %sB/%sB of source archives.\n" +#: methods/ftp.cc +msgid "Unable to accept connection" msgstr "" -#: cmdline/apt-get.cc:2341 -#, c-format -msgid "Need to get %sB of source archives.\n" +#: methods/ftp.cc methods/rsh.cc methods/server.cc +msgid "Problem hashing file" msgstr "" -#: cmdline/apt-get.cc:2347 +#: methods/ftp.cc #, c-format -msgid "Fetch source %s\n" +msgid "Unable to fetch file, server said '%s'" msgstr "" -#: cmdline/apt-get.cc:2380 -msgid "Failed to fetch some archives." +#: methods/ftp.cc methods/rsh.cc +msgid "Data socket timed out" msgstr "" -#: cmdline/apt-get.cc:2409 +#: methods/ftp.cc #, c-format -msgid "Skipping unpack of already unpacked source in %s\n" +msgid "Data transfer failed, server said '%s'" msgstr "" -#: cmdline/apt-get.cc:2421 -#, c-format -msgid "Unpack command '%s' failed.\n" +#. Get the files information +#: methods/ftp.cc +msgid "Query" msgstr "" -#: cmdline/apt-get.cc:2422 -#, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" +#: methods/ftp.cc +msgid "Unable to invoke " msgstr "" -#: cmdline/apt-get.cc:2439 -#, c-format -msgid "Build command '%s' failed.\n" +#: methods/gpgv.cc +msgid "At least one invalid signature was encountered." msgstr "" -#: cmdline/apt-get.cc:2459 -msgid "Child process failed" +#: methods/gpgv.cc +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: cmdline/apt-get.cc:2475 -msgid "Must specify at least one package to check builddeps for" +#: methods/gpgv.cc +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)" msgstr "" -#: cmdline/apt-get.cc:2721 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc #, c-format msgid "" -"No architecture information available for %s. See apt.conf(5) " -"APT::Architectures for setup" -msgstr "" - -#: cmdline/apt-get.cc:2503 -#, c-format -msgid "Unable to get build-dependency information for %s" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" msgstr "" -#: cmdline/apt-get.cc:2523 -#, c-format -msgid "%s has no build depends.\n" +#: methods/gpgv.cc +msgid "Unknown error executing apt-key" msgstr "" -#: cmdline/apt-get.cc:2888 +#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. +#: methods/gpgv.cc #, c-format -msgid "" -"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -"packages" +msgid "Signature by key %s uses weak digest algorithm (%s)" msgstr "" -#: cmdline/apt-get.cc:2575 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" +#: methods/gpgv.cc +msgid "The following signatures were invalid:\n" msgstr "" -#: cmdline/apt-get.cc:2664 -#, c-format +#: methods/gpgv.cc msgid "" -"Failed to satisfy %s dependency for %s: Installed package %s is too new" +"The following signatures couldn't be verified because the public key is not " +"available:\n" msgstr "" -#: cmdline/apt-get.cc:2971 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because candidate version of " -"package %s can't satisfy version requirements" +#: methods/http.cc +msgid "Error writing to the file" msgstr "" -#: cmdline/apt-get.cc:2977 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because package %s has no candidate " -"version" +#: methods/http.cc +msgid "Error reading from server. Remote end closed connection" msgstr "" -#: cmdline/apt-get.cc:2691 -#, c-format -msgid "Failed to satisfy %s dependency for %s: %s" +#: methods/http.cc +msgid "Error reading from server" msgstr "" -#: cmdline/apt-get.cc:2707 -#, c-format -msgid "Build-dependencies for %s could not be satisfied." +#: methods/http.cc +msgid "Error writing to file" msgstr "" -#: cmdline/apt-get.cc:2712 -msgid "Failed to process build dependencies" +#: methods/http.cc +msgid "Select failed" msgstr "" -#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989 -#, c-format -msgid "Changelog for %s (%s)" +#: methods/http.cc +msgid "Connection timed out" msgstr "" -#: cmdline/apt-get.cc:2744 -msgid "Supported modules:" +#: methods/http.cc +msgid "Error writing to output file" msgstr "" -#: cmdline/apt-get.cc:3289 -msgid "" -"Usage: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get is a simple command line interface for downloading and\n" -"installing packages. The most frequently used commands are update\n" -"and install.\n" -"\n" -"Commands:\n" -" update - Retrieve new lists of packages\n" -" upgrade - Perform an upgrade\n" -" install - Install new packages (pkg is libc6 not libc6.deb)\n" -" remove - Remove packages\n" -" autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" -" source - Download source archives\n" -" build-dep - Configure build-dependencies for source packages\n" -" dist-upgrade - Distribution upgrade, see apt-get(8)\n" -" dselect-upgrade - Follow dselect selections\n" -" clean - Erase downloaded archive files\n" -" autoclean - Erase old downloaded archive files\n" -" check - Verify that there are no broken dependencies\n" -" changelog - Download and display the changelog for the given package\n" -" download - Download the binary package into the current directory\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -d Download only - do NOT install or unpack archives\n" -" -s No-act. Perform ordering simulation\n" -" -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to correct a system with broken dependencies in place\n" -" -m Attempt to continue if archives are unlocatable\n" -" -u Show a list of upgraded packages as well\n" -" -b Build the source package after fetching it\n" -" -V Show verbose version numbers\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -"pages for more information and options.\n" -" This APT has Super Cow Powers.\n" +#: methods/mirror.cc +#, c-format +msgid "Unable to read %s" msgstr "" -#: cmdline/apt-get.cc:2952 -msgid "" -"NOTE: This is only a simulation!\n" -" apt-get needs root privileges for real execution.\n" -" Keep also in mind that locking is deactivated,\n" -" so don't depend on the relevance to the real current situation!" +#: methods/mirror.cc +#, c-format +msgid "Unable to change to %s" msgstr "" -#: cmdline/acqprogress.cc:55 -msgid "Hit " +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc +#, c-format +msgid "No mirror file '%s' found " msgstr "" -#: cmdline/acqprogress.cc:79 -msgid "Get:" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc +#, c-format +msgid "Can not read mirror file '%s'" msgstr "" -#: cmdline/acqprogress.cc:110 -msgid "Ign " +#: methods/mirror.cc +#, c-format +msgid "No entry found in mirror file '%s'" msgstr "" -#: cmdline/acqprogress.cc:114 -msgid "Err " +#: methods/mirror.cc +#, c-format +msgid "[Mirror: %s]" msgstr "" -#: cmdline/acqprogress.cc:135 +#: methods/rred.cc #, c-format -msgid "Fetched %sB in %s (%sB/s)\n" +msgid "Failed to stat %s" msgstr "" -#: cmdline/acqprogress.cc:225 -#, c-format -msgid " [Working]" +#: methods/rsh.cc +msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: cmdline/acqprogress.cc:271 -#, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" +#: methods/rsh.cc +msgid "Connection closed prematurely" msgstr "" -#: cmdline/apt-internal-solver.cc:34 -msgid "" -"Usage: apt-internal-resolver\n" -"\n" -"apt-internal-resolver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"apt.conf(5) manual pages for more information and options.\n" -" This APT has Super Cow Powers.\n" +#: methods/server.cc +msgid "Waiting for headers" msgstr "" -#: cmdline/apt-mark.cc:46 -#, c-format -msgid "%s can not be marked as it is not installed.\n" +#: methods/server.cc +msgid "Bad header line" msgstr "" -#: cmdline/apt-mark.cc:52 -#, c-format -msgid "%s was already set to manually installed.\n" +#: methods/server.cc +msgid "The HTTP server sent an invalid reply header" msgstr "" -#: cmdline/apt-mark.cc:54 -#, c-format -msgid "%s was already set to automatically installed.\n" +#: methods/server.cc +msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: cmdline/apt-mark.cc:169 -#, c-format -msgid "%s was already set on hold.\n" +#: methods/server.cc +msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: cmdline/apt-mark.cc:171 -#, c-format -msgid "%s was already not hold.\n" +#: methods/server.cc +msgid "This HTTP server has broken range support" msgstr "" -#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 -#, c-format -msgid "%s set on hold.\n" +#: methods/server.cc +msgid "Unknown date format" msgstr "" -#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 -#, c-format -msgid "Canceled hold on %s.\n" +#: methods/server.cc +msgid "Bad header data" msgstr "" -#: cmdline/apt-mark.cc:220 -msgid "Executing dpkg failed. Are you root?" +#: methods/server.cc +msgid "Connection failed" msgstr "" -#: cmdline/apt-mark.cc:268 +#: methods/server.cc +#, c-format msgid "" -"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" -"\n" -"apt-mark is a simple command line interface for marking packages\n" -"as manual or automatical installed. It can also list marks.\n" -"\n" -"Commands:\n" -" auto - Mark the given packages as automatically installed\n" -" manual - Mark the given packages as manually installed\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -s No-act. Just prints what would be done.\n" -" -f read/write auto/manual marking in the given file\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-mark(8) and apt.conf(5) manual pages for more information." +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" msgstr "" -#: cmdline/apt-sortpkgs.cc:86 -msgid "Unknown package record!" +#: methods/server.cc +msgid "Internal error" msgstr "" -#: cmdline/apt-sortpkgs.cc:150 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: methods/store.cc +msgid "Empty files can't be valid archives" msgstr "" -#: dselect/install:32 +#: dselect/install:33 msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 -#: dselect/install:105 dselect/update:45 -msgid "Press enter to continue." +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press [Enter] to continue." msgstr "" -#: dselect/install:91 +#: dselect/install:92 msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" -#: dselect/install:101 +#: dselect/install:102 msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" -#: dselect/install:102 +#: dselect/install:103 msgid "will be configured. This may result in duplicate errors" msgstr "" -#: dselect/install:103 +#: dselect/install:104 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -#: dselect/install:104 +#: dselect/install:105 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apturl.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apturl.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/apturl.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/apturl.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:17+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/avahi.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/avahi.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/avahi.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/avahi.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:32+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../avahi-common/error.c:30 msgid "OK" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bash.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bash.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bash.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bash.po 2016-04-15 08:51:13.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 11:15+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:50+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: arrayfunc.c:51 msgid "bad array subscript" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bison.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bison.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bison.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bison.po 2016-04-15 08:51:14.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 11:19+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:54+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/complain.c:322 msgid "fatal error" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bison-runtime.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bison-runtime.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bison-runtime.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bison-runtime.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:19+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:54+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: data/glr.c:803 data/yacc.c:643 msgid "syntax error: cannot back up" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bootloader.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bootloader.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/bootloader.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/bootloader.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,477 +0,0 @@ -# Burmese translation for gfxboot-theme-ubuntu -# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the gfxboot-theme-ubuntu package. -# FIRST AUTHOR , 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: gfxboot-theme-ubuntu\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2016-03-22 00:02+0000\n" -"PO-Revision-Date: 2014-12-27 11:07+0000\n" -"Last-Translator: Rockworld \n" -"Language-Team: Burmese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:01+0000\n" -"X-Generator: Launchpad (build 17958)\n" -"Language: my\n" - -#. ok button label -#. txt_ok -msgid "OK" -msgstr "ရျပီ" - -#. cancel button label -#. txt_cancel -msgid "Cancel" -msgstr "ပယ်ဖျက်သည်" - -#. reboot button label -#. txt_reboot -msgid "Reboot" -msgstr "စနစ်ပြန်လည်စတင်ရန်" - -#. continue button label -#. txt_continue -msgid "Continue" -msgstr "ဆက်လုပ်" - -#. txt_bootoptions -msgid "Boot Options" -msgstr "Boot ရွေးချယ်ခွင့်များ" - -#. window title for exit dialog -#. txt_exit_title (see txt_exit_dialog) -msgid "Exiting..." -msgstr "စနစ်မှ ထွက်ခွာနေသည်........." - -#. txt_exit_dialog -msgid "" -"You are leaving the graphical boot menu and\n" -"starting the text mode interface." -msgstr "" -"သင် Graphical boot menu မှ ထွက်ခွာပြီး\n" -"စာသားမြင်ကွင်း စနစ်ကို စတင်နေပါပြီ။" - -#. txt_help -msgid "Help" -msgstr "အကူအညီ" - -#. info box title -#. txt_info_title -msgid "Boot loader" -msgstr "Boot loader" - -#. error box title -#. txt_error_title -msgid "I/O error" -msgstr "စနစ် ဝင်/ထွက် မှားယွင်းမှု" - -#. boot disk change dialog title -#. txt_change_disk_title -msgid "Change Boot Disk" -msgstr "အခွေပြောင်းပါ" - -#. txt_insert_disk -#, c-format -msgid "Insert boot disk %u." -msgstr "%u စနစ်စတင်ခွေ ထည့်ပါ။" - -#. txt_insert_disk2 -#, c-format -msgid "" -"This is boot disk %u.\n" -"Insert boot disk %u." -msgstr "" -"ဤသည်မှာ %u စနစ်စတင်ခွေဖြစ်သည်။\n" -"%u စနစ်စတင်ခွေ ထည့်ပါ။" - -#. txt_insert_disk3 -#, c-format -msgid "" -"This is not a suitable boot disk.\n" -"Please insert boot disk %u." -msgstr "" -"မကောင်းသော စနစ်စတင်ခွေ ဖြစ်သည်။\n" -"ကျေးဇူးပြု၍ %u စနစ်စတင်ခွေ ထည့်သွင်းပါ။" - -#. password dialog title -#. txt_password_title -msgid "Password" -msgstr "စကားဝှက်" - -#. Keep the newlines and spaces after ':'! -#. txt_password -msgid "" -"Enter your password: \n" -"\n" -"\n" -msgstr "" -"သင်၏စကားဝှက်ကို ထည့်သွင်းပါ။ \n" -"\n" -"\n" - -#. dvd warning title -#. txt_dvd_warning_title -msgid "DVD Error" -msgstr "DVD အမှား" - -#. txt_dvd_warning2 -msgid "" -"This is a two-sided DVD. You have booted from the second side.\n" -"\n" -"Turn the DVD over then continue." -msgstr "" -"နှစ်ဘက်သုံး DVD ဖြစ်သည်။ ဒုတိယဘက်ခြမ်းမှ စက်လည်ပတ်မှုစနစ်ကိုပြုလုပ်ရန် " -"လိုအပ်သေးသည်။ \n" -"DVD အား တခြားဘက်လှန် ၍ဆက်လက်လုပ် ဆောင်ရန်။" - -#. power off dialog title -#. txt_power_off_title -msgid "Power Off" -msgstr "စက်ပိတ်ရန်" - -#. txt_power_off -msgid "Halt the system now?" -msgstr "စနစ်ကို ယခုရပ်တန့်မလား?" - -#. txt_password -msgid "Password\n" -msgstr "စကားဝှက်\n" - -#. button label for other/more options -#. txt_other_options -msgid "Other Options" -msgstr "အခြား ရွေးစရာများ" - -#. label for language selection -#. txt_language -msgid "Language" -msgstr "ဘာသာစကား" - -#. label for keymap selection -#. txt_keymap -msgid "Keymap" -msgstr "သော့ချက်" - -#. label for installation mode selection -#. txt_modes -msgid "Modes" -msgstr "နည်းလမ်းများ" - -#. label for modes menu -#. txt_mode_normal -msgid "Normal" -msgstr "သာမန်" - -#. label for d-i mode menu -#. txt_expert_mode -msgid "Expert mode" -msgstr "ကျွမ်းကျင်သူအဆင့်" - -#. title for accessibility menu -#. txt_access -msgid "Accessibility" -msgstr "Accessibility" - -#. label for accessibility menu -#. txt_access_none -msgid "None" -msgstr "None" - -#. label for accessibility menu -#. txt_access_v1 -msgid "High Contrast" -msgstr "ပုံကြီးချဲ့ကြည့်ရန်" - -#. label for accessibility menu -#. txt_access_v2 -msgid "Magnifier" -msgstr "ပုံကြီးချဲ့ရန်" - -#. label for accessibility menu -#. txt_access_v3 -msgid "Screen Reader" -msgstr "စကရင်ဖတ်ရန်" - -#. label for accessibility menu -#. txt_access_brltty -msgid "Braille Terminal" -msgstr "မျက်မမြင်စာစနစ်" - -#. label for accessibility menu -#. txt_access_m1 -msgid "Keyboard Modifiers" -msgstr "ကီးဘုတ်ခလုတ်ပြောင်းရန်" - -#. label for accessibility menu -#. txt_access_m2 -msgid "On-Screen Keyboard" -msgstr "မြင်ကွင်းပြ ကီးဘုတ်" - -#. label for accessibility menu -#. txt_access_m3 -msgid "Motor Difficulties - switch devices" -msgstr "စက်အခက်အခဲ=ကိရိယာလဲလှယ်သည်" - -#. label for accessibility menu -#. txt_access_all -msgid "Everything" -msgstr "အရာအားလုံး" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_ubuntu -msgid "^Try Ubuntu without installing" -msgstr "^Ubuntu ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_kubuntu -msgid "^Try Kubuntu without installing" -msgstr "^Kubuntu ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_edubuntu -msgid "^Try Edubuntu without installing" -msgstr "^Edubuntu ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_xubuntu -msgid "^Try Xubuntu without installing" -msgstr "^Xubuntu ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_ubuntu_mid -msgid "^Try Ubuntu MID without installing" -msgstr "^Ubuntu MID ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_ubuntu_netbook -msgid "^Try Ubuntu Netbook without installing" -msgstr "^Ubuntu Netbook ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_kubuntu_netbook -msgid "^Try Kubuntu Netbook without installing" -msgstr "^Kubuntu Netbook ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_lubuntu -msgid "^Try Lubuntu without installing" -msgstr "^ထည့်သွင်းခြင်းမရှိပဲ Lubuntu ကို စမ်းကြည့်ပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_ubuntu_gnome -msgid "^Try Ubuntu GNOME without installing" -msgstr "^Ubuntu GNOME ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_ubuntu_mate -msgid "^Try Ubuntu MATE without installing" -msgstr "" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_start_kubuntu -msgid "^Start Kubuntu" -msgstr "^Kubuntu ကို စရန်" - -#. Installation mode. -#. txt_menuitem_driverupdates -msgid "Use driver update disc" -msgstr "Driver update အခွေကိုသုံးပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_text_ubuntu -msgid "^Install Ubuntu in text mode" -msgstr "^စာသားစနစ်ဖြင့် Ubuntu ကိုသွင်းပါ။" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_text_kubuntu -msgid "^Install Kubuntu in text mode" -msgstr "^စာသားစနစ်ဖြင့် Kubuntu ကိုသွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_text_edubuntu -msgid "^Install Edubuntu in text mode" -msgstr "^စာသားစနစ်ဖြင့် Edubuntu ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_text_xubuntu -msgid "^Install Xubuntu in text mode" -msgstr "^စာသားစနစ်ဖြင့် Xubuntu ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntu -msgid "^Install Ubuntu" -msgstr "^Ubuntu ကိုသွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_kubuntu -msgid "^Install Kubuntu" -msgstr "^Kubuntu ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_edubuntu -msgid "^Install Edubuntu" -msgstr "^Edubuntu ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_xubuntu -msgid "^Install Xubuntu" -msgstr "^Xubuntu ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntu_server -msgid "^Install Ubuntu Server" -msgstr "^Ubuntu Server ကိုသွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntu_gnome -msgid "^Install Ubuntu GNOME" -msgstr "^Ubuntu GNOME ကိုသွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntu_mate -msgid "^Install Ubuntu MATE" -msgstr "" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_enlist_ubuntu_maas -msgid "^Multiple server install with MAAS" -msgstr "" -"^MASS စနစ်ဖြင့် Server အမြောက်အများကို ထည့်သွင်းရန် install လုပ်ခြင်း" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntustudio -msgid "^Install Ubuntu Studio" -msgstr "^Ubuntu Studio ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntu_mid -msgid "^Install Ubuntu MID" -msgstr "^Ubuntu MID ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_ubuntu_netbook -msgid "^Install Ubuntu Netbook" -msgstr "^Ubuntu Netbook ကိုသွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_kubuntu_netbook -msgid "^Install Kubuntu Netbook" -msgstr "^Kubuntu Netbook ကိုသွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_lubuntu -msgid "^Install Lubuntu" -msgstr "^Lubuntu ကို ထည့်သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_workstation -msgid "Install a workstation" -msgstr "workstation တစ်ခုကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_server -msgid "Install a server" -msgstr "ဆာဗာတစ်ခုကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_oem -msgid "OEM install (for manufacturers)" -msgstr "OEM ကို သွင်းပါ (ထုတ်လုပ်ဖြန့်ချိသူများအတွက်)" - -#. Installation mode. -#. txt_menuitem_lamp -msgid "Install a LAMP server" -msgstr "LAMP server ကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_ltsp -msgid "Install an LTSP server" -msgstr "LTSP Server ကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_ltsp_mythbuntu -msgid "Install a Diskless Image Server" -msgstr "Diskless ပုံရိပ်ဆာဗာ တစ်ခုကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_cli -msgid "Install a command-line system" -msgstr "အမိန့်စာသား ရိုက်သွင်းစနစ်ကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_minimal -msgid "Install a minimal system" -msgstr "ချုံထားသောစနစ် တစ်ခုကို သွင်းပါ" - -#. Installation mode. -#. txt_menuitem_minimalvm -msgid "Install a minimal virtual machine" -msgstr "ချုံထားသောစက်အတု တစ်ခုကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_check -msgid "^Check disc for defects" -msgstr "^လိုအပ်သည်များပြုပြင်ရန် အခွေကို စစ်ဆေးပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_rescue -msgid "^Rescue a broken system" -msgstr "^ချို့ယွင်းစနစ်ကို ပြင်ဆင်ရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_memtest -msgid "Test ^memory" -msgstr "^မှတ်ဉာဏ်ကို စစ်ဆေးရန်" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_hd -msgid "^Boot from first hard disk" -msgstr "^ပထမ ဟာဒ့်ဒစ်ထဲမှ boot တက်မည်" - -#. Boot option. -#. txt_option_free -msgid "Free software only" -msgstr "အခမဲ့ ဆော့ဝဲများသာ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_dell_factory_recovery -msgid "^Dell Automatic Reinstall" -msgstr "Dell အလိုလျောက် ပြန်လည်ထည့်သွင်း" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_install_mythbuntu -msgid "^Install Mythbuntu" -msgstr "^Mythbuntu ကို သွင်းပါ" - -#. Boot menu item; a ^ prefix indicates a unique accelerator key. -#. txt_menuitem_live_mythbuntu -msgid "^Try Mythbuntu without installing" -msgstr "Mythbuntu ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. txt_menuitem_live_ubuntukylin -msgid "^Try Ubuntu Kylin without installing" -msgstr "^Ubuntu Kylin ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. txt_menuitem_live_ubuntukylin_netbook -msgid "^Try Ubuntu Kylin Netbook without installing" -msgstr "^Ubuntu Kylin Netbook ကို စက်အတွင်း မထည့်သွင်းပဲ စမ်းကြည့်ရန်" - -#. txt_menuitem_install_text_ubuntukylin -msgid "^Install Ubuntu Kylin in text mode" -msgstr "^စာသားစနစ်ဖြင့် Ubuntu Kylin ကိုသွင်းပါ။" - -#. txt_menuitem_install_ubuntukylin -msgid "^Install Ubuntu Kylin" -msgstr "^Ubuntu Kylin ကိုသွင်းပါ" - -#. txt_menuitem_install_ubuntukylin_netbook -msgid "^Install Ubuntu Kylin Netbook" -msgstr "^Ubuntu Kylin Netbook ကိုသွင်းပါ" - -#. txt_menuitem_start_ubuntukylin -msgid "^Start Ubuntu Kylin" -msgstr "^Ubuntu​ Kylin ကို စရန်" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/byobu.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/byobu.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/byobu.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/byobu.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:56+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:33+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/checkbox.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/checkbox.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/checkbox.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/checkbox.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:28+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. Title of the user interface #: ../qt/checkbox-qt.desktop.in.h:1 ../plugins/user_interface.py:43 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/click.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/click.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/click.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/click.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:44+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 08:22+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../pk-plugin/com.ubuntu.click.policy.in.h:1 msgid "Install package" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/command-not-found.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/command-not-found.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/command-not-found.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/command-not-found.po 2016-04-15 08:51:15.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2016-02-05 06:06+0000\n" +"POT-Creation-Date: 2016-04-14 07:58+0000\n" "PO-Revision-Date: 2012-09-09 11:47+0000\n" "Last-Translator: Pyae Sone \n" "Language-Team: Burmese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:13+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:52+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../CommandNotFound/CommandNotFound.py:148 #, python-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/coreutils.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/coreutils.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/coreutils.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/coreutils.po 2016-04-15 08:51:14.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 11:22+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:56+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: lib/argmatch.c:133 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/cracklib.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/cracklib.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/cracklib.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/cracklib.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:23+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:58+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: lib/fascist.c:516 msgid "it is based on your username" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/cwidget.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/cwidget.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/cwidget.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/cwidget.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:43+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:19+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/debianutils.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/debianutils.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/debianutils.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/debianutils.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:24+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:58+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. type: TH #: ../add-shell.8:1 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:04+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:42+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/devscripts.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/devscripts.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/devscripts.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/devscripts.po 2016-04-15 08:51:12.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: devscripts\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-30 05:32+0000\n" +"POT-Creation-Date: 2016-03-19 18:36+0000\n" "PO-Revision-Date: 2013-06-07 07:54+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Burmese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:24+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:59+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -24,19 +24,19 @@ msgstr "" #. type: TH -#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uscan.1:1 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 +#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 #, no-wrap msgid "Debian Utilities" msgstr "" #. type: TH -#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-depcheck.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uscan.1:1 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 +#: ../scripts/annotate-output.1:1 ../scripts/archpath.1:1 ../scripts/checkbashisms.1:1 ../scripts/cvs-debc.1:1 ../scripts/cvs-debi.1:1 ../scripts/cvs-debrelease.1:1 ../scripts/cvs-debuild.1:1 ../scripts/dcmd.1:1 ../scripts/debc.1:1 ../scripts/debchange.1:1 ../scripts/debclean.1:1 ../scripts/debdiff.1:1 ../scripts/debi.1:1 ../scripts/debpkg.1:1 ../scripts/debrelease.1:1 ../scripts/debrsign.1:1 ../scripts/debsign.1:1 ../scripts/debuild.1:1 ../scripts/dep3changelog.1:1 ../scripts/devscripts.1:1 ../scripts/dpkg-depcheck.1:1 ../scripts/dpkg-genbuilddeps.1:1 ../doc/edit-patch.1:1 ../scripts/dscextract.1:1 ../scripts/dscverify.1:1 ../scripts/getbuildlog.1:1 ../scripts/grep-excuses.1:1 ../scripts/list-unreleased.1:1 ../scripts/manpage-alert.1:1 ../scripts/mergechanges.1:1 ../scripts/nmudiff.1:1 ../scripts/plotchangelog.1:1 ../scripts/pts-subscribe.1:1 ../scripts/rc-alert.1:1 ../doc/suspicious-source.1:15 ../scripts/uupdate.1:1 ../doc/what-patch.1:1 ../scripts/whodepends.1:1 ../scripts/who-uploads.1:1 ../scripts/wnpp-alert.1:1 ../scripts/wnpp-check.1:1 ../doc/wrap-and-sort.1:15 ../scripts/devscripts.conf.5:1 #, no-wrap msgid "DEBIAN" msgstr "DEBIAN" #. type: SH -#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:18 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:198 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:538 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:23 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/mk-origtargz.pl:25 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/origtargz.pl:20 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:228 ../scripts/sadt.pod:17 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:77 ../scripts/transition-check.pl:23 ../scripts/uscan.1:2 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/who-permits-upload.pl:42 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 +#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:21 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:198 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:537 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:23 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/mk-origtargz.pl:25 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/origtargz.pl:20 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:228 ../scripts/sadt.pod:17 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:77 ../scripts/transition-check.pl:23 ../scripts/uscan.pl:27 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/who-permits-upload.pl:43 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 #, no-wrap msgid "NAME" msgstr "အမည်" @@ -47,7 +47,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:191 ../scripts/build-rdeps.pl:22 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:202 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:542 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:27 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/mk-origtargz.pl:29 ../scripts/nmudiff.1:4 ../scripts/origtargz.pl:24 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:232 ../scripts/sadt.pod:21 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:81 ../scripts/transition-check.pl:27 ../scripts/uscan.1:4 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/who-permits-upload.pl:46 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 +#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:191 ../scripts/build-rdeps.pl:25 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:202 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:541 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:27 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/mk-origtargz.pl:29 ../scripts/nmudiff.1:4 ../scripts/origtargz.pl:24 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:232 ../scripts/sadt.pod:21 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:81 ../scripts/transition-check.pl:27 ../scripts/uscan.pl:31 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/who-permits-upload.pl:47 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 #, no-wrap msgid "SYNOPSIS" msgstr "အနှစ်ချုပ်" @@ -58,7 +58,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:195 ../scripts/build-rdeps.pl:26 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:6 ../scripts/dcontrol.pl:210 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:552 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:36 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:8 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/mk-origtargz.pl:39 ../scripts/nmudiff.1:6 ../scripts/origtargz.pl:34 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:240 ../scripts/sadt.pod:25 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:85 ../scripts/transition-check.pl:33 ../scripts/uscan.1:6 ../scripts/uupdate.1:8 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/who-permits-upload.pl:50 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 +#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:195 ../scripts/build-rdeps.pl:29 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:6 ../scripts/dcontrol.pl:210 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:551 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:36 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:6 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/mk-origtargz.pl:39 ../scripts/nmudiff.1:6 ../scripts/origtargz.pl:34 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:240 ../scripts/sadt.pod:25 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:85 ../scripts/transition-check.pl:33 ../scripts/uscan.pl:35 ../scripts/uupdate.1:10 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/who-permits-upload.pl:51 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 #, no-wrap msgid "DESCRIPTION" msgstr "ဖော်ပြချက်" @@ -71,7 +71,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:247 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:15 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:52 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:593 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:45 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/mk-origtargz.pl:53 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:95 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:249 ../scripts/sadt.pod:42 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:91 ../scripts/transition-check.pl:42 ../scripts/uscan.1:363 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/who-permits-upload.pl:56 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:35 +#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:247 ../scripts/build-rdeps.pl:45 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:15 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:52 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:592 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:45 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:12 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/mk-origtargz.pl:62 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:95 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:249 ../scripts/sadt.pod:42 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:91 ../scripts/transition-check.pl:42 ../scripts/uupdate.1:54 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/who-permits-upload.pl:57 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:35 #, no-wrap msgid "OPTIONS" msgstr "ရွေးပိုင်ခွင့်များ" @@ -89,18 +89,18 @@ msgstr "" #. type: TP -#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:96 ../scripts/debsnap.1:57 ../scripts/dget.pl:653 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:103 ../scripts/rmadison.pl:273 ../scripts/sadt.pod:59 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:36 +#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:96 ../scripts/debsnap.1:73 ../scripts/dget.pl:652 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:103 ../scripts/rmadison.pl:273 ../scripts/sadt.pod:59 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:36 #, no-wrap msgid "B<-h>, B<--help>" msgstr "B<-h>, B<--help>" #. type: Plain text -#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:47 +#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 msgid "Display a help message and exit successfully." msgstr "" #. type: SH -#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 ../scripts/uscan.1:348 +#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 #, no-wrap msgid "EXAMPLE" msgstr "နမူနာ" @@ -119,7 +119,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:32 ../scripts/debsnap.1:136 ../scripts/rc-alert.1:119 ../scripts/whodepends.1:17 +#: ../scripts/annotate-output.1:32 ../scripts/debsnap.1:152 ../scripts/rc-alert.1:119 ../scripts/whodepends.1:17 #, no-wrap msgid "BUGS" msgstr "" @@ -151,7 +151,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4140 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:107 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:231 ../scripts/debclean.1:107 ../scripts/debcommit.pl:913 ../scripts/debdiff.1:233 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:715 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:75 ../scripts/grep-excuses.1:45 ../scripts/licensecheck.pl:138 ../scripts/list-unreleased.1:19 ../scripts/mk-origtargz.pl:148 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:157 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:370 ../scripts/sadt.pod:69 ../scripts/tagpending.pl:146 ../scripts/uscan.1:585 ../scripts/uupdate.1:173 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:161 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:26 ../scripts/devscripts.conf.5:54 +#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4179 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:107 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:231 ../scripts/debclean.1:107 ../scripts/debcommit.pl:911 ../scripts/debdiff.1:234 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:134 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:714 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:75 ../scripts/grep-excuses.1:45 ../scripts/list-unreleased.1:19 ../scripts/mk-origtargz.pl:181 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:157 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:370 ../scripts/sadt.pod:69 ../scripts/tagpending.pl:146 ../scripts/uscan.pl:1672 ../scripts/uupdate.1:189 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:162 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:26 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -176,7 +176,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:346 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:110 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:106 ../scripts/debc.1:119 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:236 ../scripts/debclean.1:110 ../scripts/debcommit.pl:909 ../scripts/debdiff.1:240 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:145 ../scripts/debuild.1:422 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:707 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:79 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:47 ../scripts/licensecheck.pl:134 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 ../scripts/mk-build-deps.pl:118 ../scripts/mk-origtargz.pl:152 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:161 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:374 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:591 ../scripts/uupdate.1:180 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:156 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:36 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:515 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:110 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:106 ../scripts/debc.1:119 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:236 ../scripts/debclean.1:110 ../scripts/debcommit.pl:907 ../scripts/debdiff.1:241 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:146 ../scripts/debuild.1:422 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:706 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:80 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:47 ../scripts/licensecheck.pl:152 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:28 ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 ../scripts/mk-build-deps.pl:118 ../scripts/mk-origtargz.pl:185 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:161 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:374 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.pl:1676 ../scripts/uupdate.1:196 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:157 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:36 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "စာရေးဆရာ" @@ -598,18 +598,30 @@ #. type: =item #: ../scripts/bts.pl:338 +msgid "B<--soap-timeout=>I" +msgstr "" + +#. type: textblock +#: ../scripts/bts.pl:340 +msgid "" +"Specify a timeout for SOAP calls as used by the B [IB<:>I ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1014 +#: ../scripts/bts.pl:1020 msgid "" "Uses the SOAP interface to output a list of bugs which match the given " "selection requirements." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1017 +#: ../scripts/bts.pl:1023 msgid "The following keys are allowed, and may be given multiple times." msgstr "" #. type: =item -#: ../scripts/bts.pl:1021 ../scripts/bts.pl:1864 ../scripts/who-permits-upload.pl:86 +#: ../scripts/bts.pl:1027 ../scripts/bts.pl:1870 ../scripts/who-permits-upload.pl:87 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1023 ../scripts/bts.pl:1866 +#: ../scripts/bts.pl:1029 ../scripts/bts.pl:1872 msgid "Binary package name." msgstr "" #. type: =item -#: ../scripts/bts.pl:1025 ../scripts/bts.pl:1868 +#: ../scripts/bts.pl:1031 ../scripts/bts.pl:1874 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1027 ../scripts/bts.pl:1870 +#: ../scripts/bts.pl:1033 ../scripts/bts.pl:1876 msgid "Source package name." msgstr "" #. type: =item -#: ../scripts/bts.pl:1029 +#: ../scripts/bts.pl:1035 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1031 +#: ../scripts/bts.pl:1037 msgid "E-mail address of the maintainer." msgstr "" #. type: =item -#: ../scripts/bts.pl:1033 ../scripts/bts.pl:1848 +#: ../scripts/bts.pl:1039 ../scripts/bts.pl:1854 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1035 ../scripts/bts.pl:1850 +#: ../scripts/bts.pl:1041 ../scripts/bts.pl:1856 msgid "E-mail address of the submitter." msgstr "" #. type: =item -#: ../scripts/bts.pl:1037 ../scripts/bts.pl:1876 +#: ../scripts/bts.pl:1043 ../scripts/bts.pl:1882 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1039 ../scripts/bts.pl:1878 +#: ../scripts/bts.pl:1045 ../scripts/bts.pl:1884 msgid "Bug severity." msgstr "" #. type: =item -#: ../scripts/bts.pl:1041 +#: ../scripts/bts.pl:1047 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1043 +#: ../scripts/bts.pl:1049 msgid "Status of the bug. One of B, B, or B." msgstr "" #. type: =item -#: ../scripts/bts.pl:1045 ../scripts/bts.pl:1872 +#: ../scripts/bts.pl:1051 ../scripts/bts.pl:1878 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1047 +#: ../scripts/bts.pl:1053 msgid "" "Tags applied to the bug. If B is specified, may include usertags in " "addition to the standard tags." msgstr "" #. type: =item -#: ../scripts/bts.pl:1050 ../scripts/bts.pl:1880 +#: ../scripts/bts.pl:1056 ../scripts/bts.pl:1886 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1052 ../scripts/bts.pl:1882 +#: ../scripts/bts.pl:1058 ../scripts/bts.pl:1888 msgid "Bug's owner." msgstr "" #. type: =item -#: ../scripts/bts.pl:1054 +#: ../scripts/bts.pl:1060 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1056 +#: ../scripts/bts.pl:1062 msgid "Address of someone who sent mail to the log." msgstr "" #. type: =item -#: ../scripts/bts.pl:1058 ../scripts/bts.pl:1884 +#: ../scripts/bts.pl:1064 ../scripts/bts.pl:1890 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1060 +#: ../scripts/bts.pl:1066 msgid "Bugs which affect this package." msgstr "" #. type: =item -#: ../scripts/bts.pl:1062 +#: ../scripts/bts.pl:1068 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1064 +#: ../scripts/bts.pl:1070 msgid "List of bugs to search within." msgstr "" #. type: =item -#: ../scripts/bts.pl:1066 +#: ../scripts/bts.pl:1072 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1068 +#: ../scripts/bts.pl:1074 msgid "Users to use when looking up usertags." msgstr "" #. type: =item -#: ../scripts/bts.pl:1070 ../scripts/bts.pl:1888 +#: ../scripts/bts.pl:1076 ../scripts/bts.pl:1894 msgid "B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1072 ../scripts/bts.pl:1890 +#: ../scripts/bts.pl:1078 ../scripts/bts.pl:1896 msgid "" "Whether to search archived bugs or normal bugs; defaults to B<0> (i.e. only " "search normal bugs). As a special case, if archive is B, both archived " @@ -1270,73 +1282,73 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:1078 +#: ../scripts/bts.pl:1084 msgid "" "For example, to select the set of bugs submitted by " "jrandomdeveloper@example.com and tagged B, one would use" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1081 +#: ../scripts/bts.pl:1087 msgid "bts select submitter:jrandomdeveloper@example.com tag:wontfix" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1083 ../scripts/bts.pl:1902 +#: ../scripts/bts.pl:1089 ../scripts/bts.pl:1908 msgid "" "If a key is used multiple times then the set of bugs selected includes those " "matching any of the supplied values; for example" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1086 +#: ../scripts/bts.pl:1092 msgid "bts select package:foo severity:wishlist severity:minor" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1088 +#: ../scripts/bts.pl:1094 msgid "" "returns all bugs of package foo with either wishlist or minor severity." msgstr "" #. type: =item -#: ../scripts/bts.pl:1101 +#: ../scripts/bts.pl:1107 msgid "" "B [I | BI | BI[B<,>I ...] | " "B] ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1103 +#: ../scripts/bts.pl:1109 msgid "" "Uses the SOAP interface to output status information for the given bugs (or " "as read from the listed files -- use B<-> to indicate STDIN)." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1106 +#: ../scripts/bts.pl:1112 msgid "By default, all populated fields for a bug are displayed." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1108 +#: ../scripts/bts.pl:1114 msgid "If B is given, empty fields will also be displayed." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1110 +#: ../scripts/bts.pl:1116 msgid "" "If B is given, only those fields will be displayed. No validity " "checking is performed on any specified fields." msgstr "" #. type: =item -#: ../scripts/bts.pl:1187 +#: ../scripts/bts.pl:1193 msgid "B I I [I ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1189 +#: ../scripts/bts.pl:1195 msgid "" "The B control command allows you to duplicate a I report. It is " "useful in the case where a single report actually indicates that multiple " @@ -1346,12 +1358,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1239 +#: ../scripts/bts.pl:1245 msgid "B I [I]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1241 +#: ../scripts/bts.pl:1247 msgid "" "Mark a I as Done. This forces interactive mode since done messages " "should include an explanation why the bug is being closed. You should " @@ -1359,22 +1371,22 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1259 +#: ../scripts/bts.pl:1265 msgid "B I [I]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1261 +#: ../scripts/bts.pl:1267 msgid "Reopen a I, with optional I." msgstr "" #. type: =item -#: ../scripts/bts.pl:1272 +#: ../scripts/bts.pl:1278 msgid "B I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1274 +#: ../scripts/bts.pl:1280 msgid "" "Archive a I that has previously been archived but is currently not. " "The I must fulfil all of the requirements for archiving with the " @@ -1382,60 +1394,60 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1286 +#: ../scripts/bts.pl:1292 msgid "B I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1288 +#: ../scripts/bts.pl:1294 msgid "Unarchive a I that is currently archived." msgstr "" #. type: =item -#: ../scripts/bts.pl:1298 +#: ../scripts/bts.pl:1304 msgid "B I I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1300 +#: ../scripts/bts.pl:1306 msgid "Change the I<title> of the I<bug>." msgstr "" #. type: =item -#: ../scripts/bts.pl:1313 +#: ../scripts/bts.pl:1319 msgid "B<summary> I<bug> [I<messagenum>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1315 +#: ../scripts/bts.pl:1321 msgid "" "Select a message number that should be used as the summary of a I<bug>." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1318 +#: ../scripts/bts.pl:1324 msgid "If no message number is given, the summary is cleared." msgstr "" #. type: =item -#: ../scripts/bts.pl:1328 +#: ../scripts/bts.pl:1334 msgid "B<submitter> I<bug> [I<bug> ...] I<submitter-email>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1330 +#: ../scripts/bts.pl:1336 msgid "" "Change the submitter address of a I<bug> or a number of bugs, with B<!> " "meaning `use the address on the current email as the new submitter address'." msgstr "" #. type: =item -#: ../scripts/bts.pl:1347 +#: ../scripts/bts.pl:1353 msgid "B<reassign> I<bug> [I<bug> ...] I<package> [I<version>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1349 +#: ../scripts/bts.pl:1355 msgid "" "Reassign a I<bug> or a number of bugs to a different I<package>. The " "I<version> field is optional; see the explanation at " @@ -1443,12 +1455,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1380 +#: ../scripts/bts.pl:1386 msgid "B<found> I<bug> [I<version>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1382 +#: ../scripts/bts.pl:1388 msgid "" "Indicate that a I<bug> was found to exist in a particular package version. " "Without I<version>, the list of fixed versions is cleared and the bug is " @@ -1456,88 +1468,88 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1399 +#: ../scripts/bts.pl:1405 msgid "B<notfound> I<bug> I<version>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1401 +#: ../scripts/bts.pl:1407 msgid "" "Remove the record that I<bug> was encountered in the given version of the " "package to which it is assigned." msgstr "" #. type: =item -#: ../scripts/bts.pl:1413 +#: ../scripts/bts.pl:1419 msgid "B<fixed> I<bug> I<version>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1415 +#: ../scripts/bts.pl:1421 msgid "" "Indicate that a I<bug> was fixed in a particular package version, without " "affecting the I<bug>'s open/closed status." msgstr "" #. type: =item -#: ../scripts/bts.pl:1427 +#: ../scripts/bts.pl:1433 msgid "B<notfixed> I<bug> I<version>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1429 +#: ../scripts/bts.pl:1435 msgid "" "Remove the record that a I<bug> was fixed in the given version of the " "package to which it is assigned." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1432 +#: ../scripts/bts.pl:1438 msgid "" "This is equivalent to the sequence of commands \"B<found> I<bug> " "I<version>\", \"B<notfound> I<bug> I<version>\"." msgstr "" #. type: =item -#: ../scripts/bts.pl:1444 +#: ../scripts/bts.pl:1450 msgid "B<block> I<bug> B<by>|B<with> I<bug> [I<bug> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1446 +#: ../scripts/bts.pl:1452 msgid "" "Note that a I<bug> is blocked from being fixed by a set of other bugs." msgstr "" #. type: =item -#: ../scripts/bts.pl:1465 +#: ../scripts/bts.pl:1471 msgid "B<unblock> I<bug> B<by>|B<with> I<bug> [I<bug> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1467 +#: ../scripts/bts.pl:1473 msgid "" "Note that a I<bug> is no longer blocked from being fixed by a set of other " "bugs." msgstr "" #. type: =item -#: ../scripts/bts.pl:1486 +#: ../scripts/bts.pl:1492 msgid "B<merge> I<bug> I<bug> [I<bug> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1488 +#: ../scripts/bts.pl:1494 msgid "Merge a set of bugs together." msgstr "" #. type: =item -#: ../scripts/bts.pl:1503 +#: ../scripts/bts.pl:1509 msgid "B<forcemerge> I<bug> I<bug> [I<bug> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1505 +#: ../scripts/bts.pl:1511 msgid "" "Forcibly merge a set of bugs together. The first I<bug> listed is the master " "bug, and its settings (those which must be equal in a normal B<merge>) are " @@ -1545,27 +1557,27 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1523 +#: ../scripts/bts.pl:1529 msgid "B<unmerge> I<bug>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1525 +#: ../scripts/bts.pl:1531 msgid "Unmerge a I<bug>." msgstr "" #. type: =item -#: ../scripts/bts.pl:1535 +#: ../scripts/bts.pl:1541 msgid "B<tag> I<bug> [B<+>|B<->|B<=>] I<tag> [I<tag> ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:1537 +#: ../scripts/bts.pl:1543 msgid "B<tags> I<bug> [B<+>|B<->|B<=>] I<tag> [I<tag> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1539 +#: ../scripts/bts.pl:1545 msgid "" "Set or unset a I<tag> on a I<bug>. The tag may either be the exact tag name " "or it may be abbreviated to any unique tag substring. (So using B<fixed> " @@ -1576,7 +1588,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:1546 +#: ../scripts/bts.pl:1552 #, no-wrap msgid "" " bts tags <bug> =\n" @@ -1584,24 +1596,24 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:1548 +#: ../scripts/bts.pl:1554 msgid "will remove all tags from the specified I<bug>." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1550 +#: ../scripts/bts.pl:1556 msgid "" "Adding/removing the B<security> tag will add \"team\\@security.debian.org\" " "to the Cc list of the control email." msgstr "" #. type: =item -#: ../scripts/bts.pl:1628 +#: ../scripts/bts.pl:1634 msgid "B<affects> I<bug> [B<+>|B<->|B<=>] I<package> [I<package> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1630 +#: ../scripts/bts.pl:1636 msgid "" "Indicates that a I<bug> affects a I<package> other than that against which " "it is filed, causing the I<bug> to be listed by default in the I<package> " @@ -1612,7 +1624,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:1636 +#: ../scripts/bts.pl:1642 #, no-wrap msgid "" " bts affects <bug> =\n" @@ -1620,32 +1632,32 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:1638 +#: ../scripts/bts.pl:1644 msgid "will remove all indications that I<bug> affects other packages." msgstr "" #. type: =item -#: ../scripts/bts.pl:1671 +#: ../scripts/bts.pl:1677 msgid "B<user> I<email>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1673 +#: ../scripts/bts.pl:1679 msgid "Specify a user I<email> address before using the B<usertags> command." msgstr "" #. type: =item -#: ../scripts/bts.pl:1689 +#: ../scripts/bts.pl:1695 msgid "B<usertag> I<bug> [B<+>|B<->|B<=>] I<tag> [I<tag> ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:1691 +#: ../scripts/bts.pl:1697 msgid "B<usertags> I<bug> [B<+>|B<->|B<=>] I<tag> [I<tag> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1693 +#: ../scripts/bts.pl:1699 msgid "" "Set or unset a user tag on a I<bug>. The I<tag> must be the exact tag name " "wanted; there are no defaults or checking of tag names. Multiple tags may " @@ -1655,7 +1667,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:1699 +#: ../scripts/bts.pl:1705 #, no-wrap msgid "" " bts usertags <bug> =\n" @@ -1663,17 +1675,17 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:1701 +#: ../scripts/bts.pl:1707 msgid "will remove all user tags from the specified I<bug>." msgstr "" #. type: =item -#: ../scripts/bts.pl:1731 +#: ../scripts/bts.pl:1737 msgid "B<claim> I<bug> [I<claim>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1733 +#: ../scripts/bts.pl:1739 msgid "" "Record that you have claimed a I<bug> (e.g. for a bug squashing party). " "I<claim> should be a unique token allowing the bugs you have claimed to be " @@ -1681,29 +1693,29 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:1737 ../scripts/bts.pl:1757 +#: ../scripts/bts.pl:1743 ../scripts/bts.pl:1763 msgid "" "If no I<claim> is specified, the environment variable B<DEBEMAIL> or " "B<EMAIL> (checked in that order) is used." msgstr "" #. type: =item -#: ../scripts/bts.pl:1753 +#: ../scripts/bts.pl:1759 msgid "B<unclaim> I<bug> [I<claim>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1755 +#: ../scripts/bts.pl:1761 msgid "Remove the record that you have claimed a bug." msgstr "" #. type: =item -#: ../scripts/bts.pl:1773 +#: ../scripts/bts.pl:1779 msgid "B<severity> I<bug> I<severity>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1775 +#: ../scripts/bts.pl:1781 msgid "" "Change the I<severity> of a I<bug>. Available severities are: B<wishlist>, " "B<minor>, B<normal>, B<important>, B<serious>, B<grave>, B<critical>. The " @@ -1711,34 +1723,34 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1792 +#: ../scripts/bts.pl:1798 msgid "B<forwarded> I<bug> I<address>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1794 +#: ../scripts/bts.pl:1800 msgid "" "Mark the I<bug> as forwarded to the given I<address> (usually an email " "address or a URL for an upstream bug tracker)." msgstr "" #. type: =item -#: ../scripts/bts.pl:1811 +#: ../scripts/bts.pl:1817 msgid "B<notforwarded> I<bug>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1813 +#: ../scripts/bts.pl:1819 msgid "Mark a I<bug> as not forwarded." msgstr "" #. type: =item -#: ../scripts/bts.pl:1823 +#: ../scripts/bts.pl:1829 msgid "B<package> [I<package> ...]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1825 +#: ../scripts/bts.pl:1831 msgid "" "The following commands will only apply to bugs against the listed " "I<package>s; this acts as a safety mechanism for the BTS. If no packages " @@ -1746,12 +1758,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1839 +#: ../scripts/bts.pl:1845 msgid "B<limit> [I<key>[B<:>I<value>]] ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1841 +#: ../scripts/bts.pl:1847 msgid "" "The following commands will only apply to bugs which meet the specified " "criterion; this acts as a safety mechanism for the BTS. If no I<value>s are " @@ -1760,47 +1772,47 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:1852 +#: ../scripts/bts.pl:1858 msgid "B<date>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1854 +#: ../scripts/bts.pl:1860 msgid "Date the bug was submitted." msgstr "" #. type: =item -#: ../scripts/bts.pl:1856 +#: ../scripts/bts.pl:1862 msgid "B<subject>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1858 +#: ../scripts/bts.pl:1864 msgid "Subject of the bug." msgstr "" #. type: =item -#: ../scripts/bts.pl:1860 +#: ../scripts/bts.pl:1866 msgid "B<msgid>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1862 +#: ../scripts/bts.pl:1868 msgid "Message-id of the initial bug report." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1874 +#: ../scripts/bts.pl:1880 msgid "Tags applied to the bug." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1886 +#: ../scripts/bts.pl:1892 msgid "Bugs affecting this package." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1896 +#: ../scripts/bts.pl:1902 msgid "" "For example, to limit the set of bugs affected by the subsequent control " "commands to those submitted by jrandomdeveloper@example.com and tagged " @@ -1808,56 +1820,56 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:1900 +#: ../scripts/bts.pl:1906 msgid "bts limit submitter:jrandomdeveloper@example.com tag:wontfix" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1905 +#: ../scripts/bts.pl:1911 msgid "bts limit package:foo severity:wishlist severity:minor" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1907 +#: ../scripts/bts.pl:1913 msgid "" "only applies the subsequent control commands to bugs of package foo with " "either B<wishlist> or B<minor> severity." msgstr "" #. type: =item -#: ../scripts/bts.pl:1982 +#: ../scripts/bts.pl:1988 msgid "B<owner> I<bug> I<owner-email>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:1984 +#: ../scripts/bts.pl:1990 msgid "" "Change the \"owner\" address of a I<bug>, with B<!> meaning `use the address " "on the current email as the new owner address'." msgstr "" #. type: textblock -#: ../scripts/bts.pl:1987 +#: ../scripts/bts.pl:1993 msgid "The owner of a bug accepts responsibility for dealing with it." msgstr "" #. type: =item -#: ../scripts/bts.pl:1998 +#: ../scripts/bts.pl:2004 msgid "B<noowner> I<bug>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2000 +#: ../scripts/bts.pl:2006 msgid "Mark a bug as having no \"owner\"." msgstr "" #. type: =item -#: ../scripts/bts.pl:2010 +#: ../scripts/bts.pl:2016 msgid "B<subscribe> I<bug> [I<email>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2012 +#: ../scripts/bts.pl:2018 msgid "" "Subscribe the given I<email> address to the specified I<bug> report. If no " "email address is specified, the environment variable B<DEBEMAIL> or B<EMAIL> " @@ -1866,7 +1878,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2017 +#: ../scripts/bts.pl:2023 msgid "" "After executing this command, you will be sent a subscription confirmation " "to which you have to reply. When subscribed to a bug report, you receive " @@ -1875,12 +1887,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:2038 +#: ../scripts/bts.pl:2044 msgid "B<unsubscribe> I<bug> [I<email>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2040 +#: ../scripts/bts.pl:2046 msgid "" "Unsubscribe the given email address from the specified bug report. As with " "subscribe above, if no email address is specified, the environment variables " @@ -1889,7 +1901,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2045 +#: ../scripts/bts.pl:2051 msgid "" "After executing this command, you will be sent an unsubscription " "confirmation to which you have to reply. Use the B<subscribe> command to, " @@ -1897,42 +1909,42 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:2065 +#: ../scripts/bts.pl:2071 msgid "B<reportspam> I<bug> ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:2067 +#: ../scripts/bts.pl:2073 msgid "" "The B<reportspam> command allows you to report a I<bug> report as containing " "spam. It saves one from having to go to the bug web page to do so." msgstr "" #. type: =item -#: ../scripts/bts.pl:2103 +#: ../scripts/bts.pl:2109 msgid "B<spamreport> I<bug> ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:2105 +#: ../scripts/bts.pl:2111 msgid "B<spamreport> is a synonym for B<reportspam>." msgstr "" #. type: =item -#: ../scripts/bts.pl:2113 +#: ../scripts/bts.pl:2119 msgid "" "B<cache> [I<options>] [I<maint_email> | I<pkg> | B<src:>I<pkg> | " "B<from:>I<submitter>]" msgstr "" #. type: =item -#: ../scripts/bts.pl:2115 +#: ../scripts/bts.pl:2121 msgid "" "B<cache> [I<options>] [B<release-critical> | B<release-critical/>... | B<RC>]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2117 +#: ../scripts/bts.pl:2123 msgid "" "Generate or update a cache of bug reports for the given email address or " "package. By default it downloads all bugs belonging to the email address in " @@ -1941,16 +1953,17 @@ "belonging to several people or packages. If multiple packages or addresses " "are supplied, bugs belonging to any of the arguments will be cached; those " "belonging to more than one of the arguments will only be downloaded once. " -"The cached bugs are stored in F<~/.devscripts_cache/bts/>." +"The cached bugs are stored in F<$XDG_CACHE_HOME/devscripts/bts/> or, if " +"B<XDG_CACHE_HOME> is not set, in F<~/.cache/devscripts/bts/>." msgstr "" #. type: textblock -#: ../scripts/bts.pl:2126 +#: ../scripts/bts.pl:2134 msgid "You can use the cached bugs with the B<-o> switch. For example:" msgstr "" #. type: verbatim -#: ../scripts/bts.pl:2128 +#: ../scripts/bts.pl:2136 #, no-wrap msgid "" " bts -o bugs\n" @@ -1959,7 +1972,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2131 +#: ../scripts/bts.pl:2139 msgid "" "Also, B<bts> will update the files in it in a piecemeal fashion as it " "downloads information from the BTS using the B<show> command. You might thus " @@ -1969,7 +1982,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2137 +#: ../scripts/bts.pl:2145 msgid "" "Some options affect the behaviour of the B<cache> command. The first is the " "setting of B<--cache-mode>, which controls how much B<bts> downloads of the " @@ -1984,7 +1997,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2148 +#: ../scripts/bts.pl:2156 msgid "" "Each of these is configurable from the configuration file, as described " "below. They may also be specified after the B<cache> command as well as at " @@ -1992,7 +2005,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2152 +#: ../scripts/bts.pl:2160 msgid "" "Finally, B<-q> or B<--quiet> will suppress messages about caches being up-to-" "date, and giving the option twice will suppress all cache messages (except " @@ -2000,7 +2013,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:2156 +#: ../scripts/bts.pl:2164 msgid "" "Beware of caching RC, though: it will take a LONG time! (With 1000+ RC bugs " "and a delay of 5 seconds between bugs, you're looking at a minimum of 1.5 " @@ -2008,19 +2021,19 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:2285 +#: ../scripts/bts.pl:2293 msgid "B<cleancache> I<package> | B<src:>I<package> | I<maintainer>" msgstr "" #. type: =item -#: ../scripts/bts.pl:2287 +#: ../scripts/bts.pl:2295 msgid "" "B<cleancache from:>I<submitter> | B<tag:>I<tag> | B<usertag:>I<tag> | " "I<number> | B<ALL>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2289 +#: ../scripts/bts.pl:2297 msgid "" "Clean the cache for the specified I<package>, I<maintainer>, etc., as " "described above for the B<bugs> command, or clean the entire cache if B<ALL> " @@ -2031,40 +2044,53 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:2338 +#: ../scripts/bts.pl:2344 +msgid "B<listcachedbugs> [I<number>]" +msgstr "" + +#. type: textblock +#: ../scripts/bts.pl:2346 +msgid "" +"List cached bug ids (intended to support bash completion). The optional " +"number argument restricts the list to those bug ids that start with that " +"number." +msgstr "" + +#. type: =item +#: ../scripts/bts.pl:2377 msgid "B<version>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2340 +#: ../scripts/bts.pl:2379 msgid "Display version and copyright information." msgstr "" #. type: =item -#: ../scripts/bts.pl:2355 +#: ../scripts/bts.pl:2394 msgid "B<help>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:2357 +#: ../scripts/bts.pl:2396 msgid "" "Display a short summary of commands, suspiciously similar to parts of this " "man page." msgstr "" #. type: SH -#: ../scripts/bts.pl:4014 ../scripts/debuild.1:86 ../scripts/diff2patches.1:40 ../scripts/pts-subscribe.1:34 +#: ../scripts/bts.pl:4053 ../scripts/debuild.1:86 ../scripts/diff2patches.1:40 ../scripts/pts-subscribe.1:34 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: =item -#: ../scripts/bts.pl:4018 +#: ../scripts/bts.pl:4057 msgid "B<DEBEMAIL>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4020 +#: ../scripts/bts.pl:4059 msgid "" "If this is set, the From: line in the email will be set to use this email " "address instead of your normal email address (as would be determined by " @@ -2072,12 +2098,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4024 +#: ../scripts/bts.pl:4063 msgid "B<DEBFULLNAME>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4026 +#: ../scripts/bts.pl:4065 msgid "" "If B<DEBEMAIL> is set, B<DEBFULLNAME> is examined to determine the full name " "to use; if this is not set, B<bts> attempts to determine a name from your " @@ -2085,25 +2111,25 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4030 +#: ../scripts/bts.pl:4069 msgid "B<BROWSER>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4032 +#: ../scripts/bts.pl:4071 msgid "" "If set, it specifies the browser to use for the B<show> and B<bugs> options. " " See the description above." msgstr "" #. type: SH -#: ../scripts/bts.pl:4037 ../scripts/dcontrol.pl:266 ../scripts/debc.1:92 ../scripts/debchange.1:392 ../scripts/debcheckout.pl:180 ../scripts/debclean.1:90 ../scripts/debcommit.pl:104 ../scripts/debdiff.1:175 ../scripts/debi.1:109 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:290 ../scripts/dget.pl:663 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:35 ../scripts/licensecheck.pl:101 ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:321 ../scripts/uscan.1:493 ../scripts/uupdate.1:91 ../scripts/who-uploads.1:50 +#: ../scripts/bts.pl:4076 ../scripts/dcontrol.pl:266 ../scripts/debc.1:92 ../scripts/debchange.1:392 ../scripts/debcheckout.pl:180 ../scripts/debclean.1:90 ../scripts/debcommit.pl:104 ../scripts/debdiff.1:176 ../scripts/debi.1:109 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:290 ../scripts/dget.pl:662 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:35 ../scripts/licensecheck.pl:119 ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:321 ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 #, no-wrap msgid "CONFIGURATION VARIABLES" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4039 ../scripts/debcommit.pl:106 ../scripts/licensecheck.pl:103 ../scripts/mass-bug.pl:134 +#: ../scripts/bts.pl:4078 ../scripts/debcommit.pl:106 ../scripts/licensecheck.pl:121 ../scripts/mass-bug.pl:134 msgid "" "The two configuration files F</etc/devscripts.conf> and F<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. Command " @@ -2113,12 +2139,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4047 +#: ../scripts/bts.pl:4086 msgid "B<BTS_OFFLINE>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4049 +#: ../scripts/bts.pl:4088 msgid "" "If this is set to B<yes>, then it is the same as the B<--offline> command " "line parameter being used. Only has an effect on the B<show> and B<bugs> " @@ -2127,12 +2153,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4054 +#: ../scripts/bts.pl:4093 msgid "B<BTS_CACHE>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4056 +#: ../scripts/bts.pl:4095 msgid "" "If this is set to B<no>, then it is the same as the B<--no-cache> command " "line parameter being used. Only has an effect on the B<show> and B<bug> " @@ -2141,12 +2167,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4061 +#: ../scripts/bts.pl:4100 msgid "B<BTS_CACHE_MODE=>{B<min>,B<mbox>,B<full>}" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4063 +#: ../scripts/bts.pl:4102 msgid "" "How much of the BTS should we mirror when we are asked to cache something? " "Just the minimum, or also the mbox or the whole thing? The default is " @@ -2156,12 +2182,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4069 +#: ../scripts/bts.pl:4108 msgid "B<BTS_FORCE_REFRESH>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4071 +#: ../scripts/bts.pl:4110 msgid "" "If this is set to B<yes>, then it is the same as the B<--force-refresh> " "command line parameter being used. Only has an effect on the B<cache> " @@ -2170,37 +2196,37 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4076 +#: ../scripts/bts.pl:4115 msgid "B<BTS_MAIL_READER>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4078 +#: ../scripts/bts.pl:4117 msgid "" "If this is set, specifies a mail reader to use instead of B<mutt>. Same as " "the B<--mailreader> command line option." msgstr "" #. type: TP -#: ../scripts/bts.pl:4081 ../scripts/mass-bug.pl:142 ../scripts/nmudiff.1:104 +#: ../scripts/bts.pl:4120 ../scripts/mass-bug.pl:142 ../scripts/nmudiff.1:104 #, no-wrap msgid "B<BTS_SENDMAIL_COMMAND>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4083 ../scripts/mass-bug.pl:144 +#: ../scripts/bts.pl:4122 ../scripts/mass-bug.pl:144 msgid "" "If this is set, specifies a B<sendmail> command to use instead of " "F</usr/sbin/sendmail>. Same as the B<--sendmail> command line option." msgstr "" #. type: =item -#: ../scripts/bts.pl:4086 +#: ../scripts/bts.pl:4125 msgid "B<BTS_ONLY_NEW>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4088 +#: ../scripts/bts.pl:4127 msgid "" "Download only new bugs when caching. Do not check for updates in bugs we " "already have. The default is B<no>. Same as the B<--only-new> command line " @@ -2208,12 +2234,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4092 +#: ../scripts/bts.pl:4131 msgid "B<BTS_SMTP_HOST>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4094 +#: ../scripts/bts.pl:4133 msgid "" "If this is set, specifies an SMTP host to use for sending mail rather than " "using the B<sendmail> command. Same as the B<--smtp-host> command line " @@ -2221,41 +2247,41 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:4098 +#: ../scripts/bts.pl:4137 msgid "" "Note that this option takes priority over B<BTS_SENDMAIL_COMMAND> if both " "are set, unless the B<--sendmail> option is used." msgstr "" #. type: =item -#: ../scripts/bts.pl:4101 +#: ../scripts/bts.pl:4140 msgid "B<BTS_SMTP_AUTH_USERNAME>, B<BTS_SMTP_AUTH_PASSWORD>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4103 +#: ../scripts/bts.pl:4142 msgid "" "If these options are set, then it is the same as the B<--smtp-username> and " "B<--smtp-password> options being used." msgstr "" #. type: =item -#: ../scripts/bts.pl:4106 +#: ../scripts/bts.pl:4145 msgid "B<BTS_SMTP_HELO>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4108 +#: ../scripts/bts.pl:4147 msgid "Same as the B<--smtp-helo> command line option." msgstr "" #. type: =item -#: ../scripts/bts.pl:4110 +#: ../scripts/bts.pl:4149 msgid "B<BTS_INCLUDE_RESOLVED>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4112 +#: ../scripts/bts.pl:4151 msgid "" "If this is set to B<no>, then it is the same as the B<--no-include-resolved> " "command line parameter being used. Only has an effect on the B<cache> " @@ -2264,24 +2290,24 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4117 +#: ../scripts/bts.pl:4156 msgid "B<BTS_SUPPRESS_ACKS>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4119 +#: ../scripts/bts.pl:4158 msgid "" "If this is set to B<yes>, then it is the same as the B<--no-ack> command " "line parameter being used. The default is B<no>." msgstr "" #. type: =item -#: ../scripts/bts.pl:4122 +#: ../scripts/bts.pl:4161 msgid "B<BTS_INTERACTIVE>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4124 +#: ../scripts/bts.pl:4163 msgid "" "If this is set to B<yes> or B<force>, then it is the same as the B<--" "interactive> or B<--force-interactive> command line parameter being used. " @@ -2289,31 +2315,31 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:4128 +#: ../scripts/bts.pl:4167 msgid "B<BTS_DEFAULT_CC>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4130 +#: ../scripts/bts.pl:4169 msgid "" "Specify a list of e-mail addresses to which a carbon copy of the generated e-" "mail to the control bot should automatically be sent." msgstr "" #. type: =item -#: ../scripts/bts.pl:4133 +#: ../scripts/bts.pl:4172 msgid "B<BTS_SERVER>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4135 +#: ../scripts/bts.pl:4174 msgid "" "Specify the name of a debbugs server which should be used instead of " "https://bugs.debian.org." msgstr "" #. type: textblock -#: ../scripts/bts.pl:4142 +#: ../scripts/bts.pl:4181 msgid "" "Please see L<https://www.debian.org/Bugs/server-control> for more details on " "how to control the BTS using emails and L<https://www.debian.org/Bugs/> for " @@ -2321,18 +2347,18 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:4146 +#: ../scripts/bts.pl:4185 msgid "querybts(1), reportbug(1), pts-subscribe(1)" msgstr "" #. type: =head1 -#: ../scripts/bts.pl:4148 ../scripts/chdist.pl:123 ../scripts/debsnap.1:126 ../scripts/mass-bug.pl:516 ../scripts/tagpending.pl:410 +#: ../scripts/bts.pl:4187 ../scripts/chdist.pl:123 ../scripts/debsnap.1:142 ../scripts/mass-bug.pl:516 ../scripts/tagpending.pl:410 #, no-wrap msgid "COPYRIGHT" msgstr "" #. type: textblock -#: ../scripts/bts.pl:4150 +#: ../scripts/bts.pl:4189 msgid "" "This program is Copyright (C) 2001-2003 by Joey Hess <joeyh@debian.org>. " "Many modifications have been made, Copyright (C) 2002-2005 Julian Gilbey " @@ -2340,142 +2366,210 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:4155 ../scripts/chdist.pl:128 ../scripts/mass-bug.pl:520 +#: ../scripts/bts.pl:4194 ../scripts/chdist.pl:128 ../scripts/mass-bug.pl:520 msgid "" "It is licensed under the terms of the GPL, either version 2 of the License, " "or (at your option) any later version." msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:20 +#: ../scripts/build-rdeps.pl:23 msgid "" "build-rdeps - find packages that depend on a specific package to build " "(reverse build depends)" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:24 +#: ../scripts/build-rdeps.pl:27 msgid "B<build-rdeps> I<package>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:28 +#: ../scripts/build-rdeps.pl:31 msgid "" "B<build-rdeps> searches for all packages that build-depend on the specified " "package." msgstr "" +#. type: textblock +#: ../scripts/build-rdeps.pl:33 +msgid "" +"The default behaviour is to just `grep` for the given dependency in the " +"Build-Depends field of apt's Sources files." +msgstr "" + +#. type: textblock +#: ../scripts/build-rdeps.pl:36 +msgid "" +"If the package dose-extra >= 4.0 is installed, then a more complete reverse " +"build dependency computation is carried out. In particular, with that " +"package installed, build-rdeps will find transitive reverse dependencies, " +"respect architecture and build profile restrictions, take Provides " +"relationships, Conflicts, Pre-Depends, Build-Depends-Arch and versioned " +"dependencies into account and correctly resolve multiarch relationships for " +"crossbuild reverse dependency resolution. (This tends to be a slow process " +"due to the complexity of the package interdependencies.)" +msgstr "" + #. type: =item -#: ../scripts/build-rdeps.pl:34 +#: ../scripts/build-rdeps.pl:49 msgid "B<-u>, B<--update>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:36 +#: ../scripts/build-rdeps.pl:51 msgid "Run apt-get update before searching for build-depends." msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:38 +#: ../scripts/build-rdeps.pl:53 msgid "B<-s>, B<--sudo>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:40 +#: ../scripts/build-rdeps.pl:55 msgid "Use sudo when running apt-get update. Has no effect if -u is omitted." msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:42 +#: ../scripts/build-rdeps.pl:57 msgid "B<--distribution>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:44 +#: ../scripts/build-rdeps.pl:59 msgid "Select another distribution, which is searched for build-depends." msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:46 +#: ../scripts/build-rdeps.pl:61 msgid "B<--only-main>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:48 +#: ../scripts/build-rdeps.pl:63 msgid "Ignore contrib and non-free" msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:50 +#: ../scripts/build-rdeps.pl:65 msgid "B<--exclude-component>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:52 +#: ../scripts/build-rdeps.pl:67 msgid "Ignore the given component (e.g. main, contrib, non-free)." msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:54 +#: ../scripts/build-rdeps.pl:69 msgid "B<--origin>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:56 +#: ../scripts/build-rdeps.pl:71 msgid "" "Restrict the search to only the specified origin (such as \"Debian\")." msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:58 +#: ../scripts/build-rdeps.pl:73 msgid "B<-m>, B<--print-maintainer>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:60 +#: ../scripts/build-rdeps.pl:75 msgid "Print the value of the maintainer field for each package." msgstr "" #. type: =item -#: ../scripts/build-rdeps.pl:62 ../scripts/dcontrol.pl:252 +#: ../scripts/build-rdeps.pl:77 +msgid "B<--host-arch>" +msgstr "" + +#. type: textblock +#: ../scripts/build-rdeps.pl:79 +msgid "" +"Explicitly set the host architecture. The default is the value of `dpkg-" +"architecture -qDEB_HOST_ARCH`. This option only works if dose-extra >= 4.0 " +"is installed." +msgstr "" + +#. type: TP +#: ../scripts/build-rdeps.pl:83 ../scripts/nmudiff.1:26 +#, no-wrap +msgid "B<--old>" +msgstr "" + +#. type: textblock +#: ../scripts/build-rdeps.pl:85 +msgid "" +"Force the old simple behaviour without dose-ceve support even if dose-extra " +">= 4.0 is installed. (This tends to be faster.)" +msgstr "" + +#. type: textblock +#: ../scripts/build-rdeps.pl:88 +msgid "" +"Notice, that the old behaviour only finds direct dependencies, ignores " +"virtual dependencies, does not find transitive dependencies and does not " +"take version relationships, architecture restrictions, build profiles or " +"multiarch relationships into account." +msgstr "" + +#. type: =item +#: ../scripts/build-rdeps.pl:93 +msgid "B<--build-arch>" +msgstr "" + +#. type: textblock +#: ../scripts/build-rdeps.pl:95 +msgid "" +"Explicitly set the build architecture. The default is the value of `dpkg-" +"architecture -qDEB_BUILD_ARCH`. This option only works if dose-extra >= 4.0 " +"is installed." +msgstr "" + +#. type: =item +#: ../scripts/build-rdeps.pl:99 ../scripts/dcontrol.pl:252 msgid "B<-d>, B<--debug>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:64 +#: ../scripts/build-rdeps.pl:101 msgid "Run the debug mode" msgstr "" -#. type: TP -#: ../scripts/build-rdeps.pl:66 ../scripts/cowpoke.1:131 ../scripts/debclean.1:84 ../scripts/diff2patches.1:22 ../scripts/grep-excuses.1:23 ../scripts/mass-bug.pl:117 ../scripts/nmudiff.1:73 ../scripts/plotchangelog.1:92 ../scripts/uscan.1:487 +#. type: =item +#: ../scripts/build-rdeps.pl:103 ../scripts/cowpoke.1:131 ../scripts/debclean.1:84 ../scripts/diff2patches.1:22 ../scripts/grep-excuses.1:23 ../scripts/mass-bug.pl:117 ../scripts/nmudiff.1:73 ../scripts/plotchangelog.1:92 ../scripts/uscan.pl:1369 #, no-wrap msgid "B<--help>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:68 +#: ../scripts/build-rdeps.pl:105 msgid "Show the usage information." msgstr "" #. type: TP -#: ../scripts/build-rdeps.pl:70 ../scripts/chdist.pl:49 ../scripts/cowpoke.1:135 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:61 ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:26 ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:308 ../scripts/uscan.1:490 ../scripts/uupdate.1:88 ../scripts/who-uploads.1:47 +#: ../scripts/build-rdeps.pl:107 ../scripts/chdist.pl:49 ../scripts/cowpoke.1:135 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:77 ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:26 ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:308 ../scripts/uscan.pl:1373 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 #, no-wrap msgid "B<--version>" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:72 +#: ../scripts/build-rdeps.pl:109 msgid "Show the version information." msgstr "" #. type: SH -#: ../scripts/build-rdeps.pl:76 ../scripts/debpkg.1:12 +#: ../scripts/build-rdeps.pl:113 ../scripts/debpkg.1:12 #, no-wrap msgid "REQUIREMENTS" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:78 +#: ../scripts/build-rdeps.pl:115 msgid "" "The tool requires apt Sources files to be around for the checked components. " " In the default case this means that in /var/lib/apt/lists files need to be " @@ -2483,30 +2577,30 @@ msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:82 +#: ../scripts/build-rdeps.pl:119 msgid "" "In practice this means one needs to add one deb-src line for each component, " "e.g." msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:85 +#: ../scripts/build-rdeps.pl:122 msgid "deb-src http://<mirror>/debian <dist> main contrib non-free" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:87 +#: ../scripts/build-rdeps.pl:124 msgid "" "and run apt-get update afterwards or use the update option of this tool." msgstr "" #. type: =head1 -#: ../scripts/build-rdeps.pl:338 ../scripts/debcommit.pl:902 ../scripts/desktop2menu.pl:43 ../scripts/licensecheck.pl:125 ../scripts/namecheck.pl:36 ../scripts/svnpath.pl:89 ../scripts/transition-check.pl:72 +#: ../scripts/build-rdeps.pl:507 ../scripts/debcommit.pl:900 ../scripts/desktop2menu.pl:43 ../scripts/licensecheck.pl:143 ../scripts/namecheck.pl:36 ../scripts/svnpath.pl:89 ../scripts/transition-check.pl:72 msgid "LICENSE" msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:340 +#: ../scripts/build-rdeps.pl:509 msgid "" "This code is copyright by Patrick Schoenfeld <schoenfeld@debian.org>, all " "rights reserved. This program comes with ABSOLUTELEY NO WARRANTY. You are " @@ -2515,7 +2609,7 @@ msgstr "" #. type: textblock -#: ../scripts/build-rdeps.pl:348 +#: ../scripts/build-rdeps.pl:517 msgid "Patrick Schoenfeld <schoenfeld@debian.org>" msgstr "" @@ -2563,8 +2657,8 @@ msgid "Choose architecture (default: `B<dpkg --print-architecture>`)." msgstr "" -#. type: Plain text -#: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239 ../scripts/mass-bug.pl:123 ../scripts/uscan.1:493 +#. type: textblock +#: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239 ../scripts/mass-bug.pl:123 ../scripts/uscan.pl:1375 msgid "Display version information." msgstr "" @@ -2777,13 +2871,13 @@ msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 ../scripts/debdiff.1:163 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:36 ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 ../scripts/uupdate.1:85 ../scripts/whodepends.1:11 ../scripts/who-uploads.1:44 ../scripts/who-permits-upload.pl:65 ../scripts/wnpp-alert.1:23 ../scripts/wnpp-check.1:17 +#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:36 ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 ../scripts/uupdate.1:101 ../scripts/whodepends.1:11 ../scripts/who-uploads.1:44 ../scripts/who-permits-upload.pl:66 ../scripts/wnpp-alert.1:23 ../scripts/wnpp-check.1:17 #, no-wrap msgid "B<--help>, B<-h>" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:27 ../scripts/debdiff.1:166 ../scripts/mk-build-deps.pl:105 ../scripts/rc-alert.1:24 ../scripts/wnpp-alert.1:26 ../scripts/wnpp-check.1:20 +#: ../scripts/checkbashisms.1:27 ../scripts/debdiff.1:167 ../scripts/manpage-alert.1:16 ../scripts/mk-build-deps.pl:105 ../scripts/rc-alert.1:24 ../scripts/wnpp-alert.1:26 ../scripts/wnpp-check.1:20 msgid "Show a summary of options." msgstr "" @@ -2843,18 +2937,18 @@ msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:46 ../scripts/debdiff.1:166 ../scripts/manpage-alert.1:17 ../scripts/rc-alert.1:24 ../scripts/whodepends.1:14 ../scripts/wnpp-alert.1:26 ../scripts/wnpp-check.1:20 +#: ../scripts/checkbashisms.1:46 ../scripts/debdiff.1:167 ../scripts/rc-alert.1:24 ../scripts/whodepends.1:14 ../scripts/wnpp-alert.1:26 ../scripts/wnpp-check.1:20 #, no-wrap msgid "B<--version>, B<-v>" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:169 ../scripts/getbuildlog.1:31 ../scripts/grep-excuses.1:29 ../scripts/manpage-alert.1:20 ../scripts/mk-build-deps.pl:109 ../scripts/rc-alert.1:27 ../scripts/whodepends.1:17 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 +#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:170 ../scripts/getbuildlog.1:31 ../scripts/grep-excuses.1:29 ../scripts/manpage-alert.1:19 ../scripts/mk-build-deps.pl:109 ../scripts/rc-alert.1:27 ../scripts/whodepends.1:17 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 msgid "Show version and copyright information." msgstr "" #. type: SH -#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:229 +#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:230 #, no-wrap msgid "EXIT VALUES" msgstr "" @@ -2867,7 +2961,7 @@ msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24 ../scripts/uscan.1:556 ../scripts/wnpp-check.1:32 +#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24 ../scripts/wnpp-check.1:32 #, no-wrap msgid "1" msgstr "" @@ -3187,7 +3281,7 @@ msgstr "" #. type: SH -#: ../scripts/cowpoke.1:140 ../scripts/debsnap.1:66 +#: ../scripts/cowpoke.1:140 ../scripts/debsnap.1:82 #, no-wrap msgid "CONFIGURATION OPTIONS" msgstr "" @@ -3581,7 +3675,7 @@ msgstr "" #. type: Plain text -#: ../scripts/cowpoke.1:325 ../scripts/debsnap.1:117 +#: ../scripts/cowpoke.1:325 ../scripts/debsnap.1:133 msgid "" "Per-user configuration options. Will override any global configuration." msgstr "" @@ -4327,7 +4421,7 @@ msgstr "" #. type: =head1 -#: ../scripts/dcmd.1:75 ../scripts/debsnap.1:93 ../scripts/debuild.1:367 ../scripts/dget.pl:692 ../scripts/getbuildlog.1:31 ../scripts/rc-alert.1:96 ../scripts/who-permits-upload.pl:133 +#: ../scripts/dcmd.1:75 ../scripts/debsnap.1:109 ../scripts/debuild.1:367 ../scripts/dget.pl:691 ../scripts/getbuildlog.1:31 ../scripts/rc-alert.1:96 ../scripts/who-permits-upload.pl:134 #, no-wrap msgid "EXAMPLES" msgstr "" @@ -4488,23 +4582,23 @@ msgstr "" #. type: textblock -#: ../scripts/dcontrol.pl:258 ../scripts/dget.pl:655 +#: ../scripts/dcontrol.pl:258 ../scripts/dget.pl:654 msgid "Show a help message." msgstr "" #. type: TP -#: ../scripts/dcontrol.pl:260 ../scripts/dd-list.1:102 ../scripts/dget.pl:657 ../scripts/getbuildlog.1:28 +#: ../scripts/dcontrol.pl:260 ../scripts/dd-list.1:102 ../scripts/dget.pl:656 ../scripts/getbuildlog.1:28 #, no-wrap msgid "B<-V>, B<--version>" msgstr "" #. type: textblock -#: ../scripts/dcontrol.pl:262 ../scripts/dget.pl:659 +#: ../scripts/dcontrol.pl:262 ../scripts/dget.pl:658 msgid "Show version information." msgstr "" #. type: textblock -#: ../scripts/dcontrol.pl:268 ../scripts/dget.pl:665 +#: ../scripts/dcontrol.pl:268 ../scripts/dget.pl:664 msgid "" "The two configuration files F</etc/devscripts.conf> and F<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. Command " @@ -4530,7 +4624,7 @@ msgstr "" #. type: textblock -#: ../scripts/dcontrol.pl:286 ../scripts/dget.pl:712 ../scripts/tagpending.pl:419 +#: ../scripts/dcontrol.pl:286 ../scripts/dget.pl:711 ../scripts/tagpending.pl:419 msgid "" "This program is licensed under the terms of the GPL, either version 2 of the " "License, or (at your option) any later version." @@ -4799,8 +4893,8 @@ "udebs with names in this list of packages will be processed." msgstr "" -#. type: SH -#: ../scripts/debc.1:28 ../scripts/debchange.1:105 ../scripts/debclean.1:24 ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 ../scripts/uscan.1:306 +#. type: =head2 +#: ../scripts/debc.1:28 ../scripts/debchange.1:105 ../scripts/debclean.1:24 ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 ../scripts/uscan.pl:1558 #, no-wrap msgid "Directory name checking" msgstr "" @@ -4819,24 +4913,24 @@ "check-dirname-regex>." msgstr "" -#. type: Plain text -#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:323 +#. type: textblock +#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.pl:1573 msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> can take the following values:" msgstr "" -#. type: TP -#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:323 +#. type: =item +#: ../scripts/debc.1:41 ../scripts/debchange.1:118 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.pl:1506 ../scripts/uscan.pl:1577 #, no-wrap msgid "B<0>" msgstr "" -#. type: Plain text -#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:326 +#. type: textblock +#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.pl:1579 msgid "Never check the directory name." msgstr "" -#. type: TP -#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:326 +#. type: =item +#: ../scripts/debc.1:44 ../scripts/debchange.1:121 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.pl:1511 ../scripts/uscan.pl:1581 #, no-wrap msgid "B<1>" msgstr "" @@ -4848,14 +4942,14 @@ "search for I<debian/changelog>. This is the default behaviour." msgstr "" -#. type: TP -#: ../scripts/debc.1:48 ../scripts/debchange.1:125 ../scripts/debclean.1:44 ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 ../scripts/uscan.1:332 +#. type: =item +#: ../scripts/debc.1:48 ../scripts/debchange.1:125 ../scripts/debclean.1:44 ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 ../scripts/uscan.pl:1588 #, no-wrap msgid "B<2>" msgstr "" -#. type: Plain text -#: ../scripts/debc.1:51 ../scripts/debchange.1:128 ../scripts/debclean.1:47 ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 ../scripts/uscan.1:335 +#. type: textblock +#: ../scripts/debc.1:51 ../scripts/debchange.1:128 ../scripts/debclean.1:47 ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 ../scripts/uscan.pl:1590 msgid "Always check the directory name." msgstr "" @@ -4876,7 +4970,7 @@ msgstr "" #. type: TP -#: ../scripts/debc.1:71 ../scripts/debdiff.1:157 ../scripts/debi.1:72 ../scripts/debrelease.1:81 +#: ../scripts/debc.1:71 ../scripts/debdiff.1:158 ../scripts/debi.1:72 ../scripts/debrelease.1:81 #, no-wrap msgid "B<--debs-dir> I<directory>" msgstr "" @@ -4889,27 +4983,27 @@ "path or relative to the top of the source directory." msgstr "" -#. type: TP -#: ../scripts/debc.1:77 ../scripts/debchange.1:369 ../scripts/debclean.1:69 ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:276 ../scripts/uscan.1:472 +#. type: =item +#: ../scripts/debc.1:77 ../scripts/debchange.1:369 ../scripts/debclean.1:69 ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:276 ../scripts/uscan.pl:1302 #, no-wrap msgid "B<--check-dirname-level> I<N>" msgstr "" #. type: Plain text -#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:476 ../scripts/uscan.1:480 +#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:280 ../scripts/debuild.1:284 msgid "" "See the above section B<Directory name checking> for an explanation of this " "option." msgstr "" -#. type: TP -#: ../scripts/debc.1:81 ../scripts/debchange.1:373 ../scripts/debclean.1:73 ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:280 ../scripts/uscan.1:476 +#. type: =item +#: ../scripts/debc.1:81 ../scripts/debchange.1:373 ../scripts/debclean.1:73 ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:280 ../scripts/uscan.pl:1306 #, no-wrap msgid "B<--check-dirname-regex> I<regex>" msgstr "" #. type: Plain text -#: ../scripts/debc.1:98 ../scripts/debchange.1:398 ../scripts/debclean.1:96 ../scripts/debi.1:115 ../scripts/debrelease.1:111 ../scripts/debrsign.1:63 ../scripts/debsign.1:112 ../scripts/nmudiff.1:85 ../scripts/pts-subscribe.1:48 ../scripts/uupdate.1:97 ../scripts/who-uploads.1:56 +#: ../scripts/debc.1:98 ../scripts/debchange.1:398 ../scripts/debclean.1:96 ../scripts/debi.1:115 ../scripts/debrelease.1:111 ../scripts/debrsign.1:63 ../scripts/debsign.1:112 ../scripts/nmudiff.1:85 ../scripts/pts-subscribe.1:48 ../scripts/uupdate.1:113 ../scripts/who-uploads.1:56 msgid "" "The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are " "sourced in that order to set configuration variables. Command line options " @@ -4919,7 +5013,7 @@ msgstr "" #. type: TP -#: ../scripts/debc.1:98 ../scripts/debdiff.1:219 ../scripts/debi.1:115 ../scripts/debrelease.1:116 ../scripts/debsign.1:124 +#: ../scripts/debc.1:98 ../scripts/debdiff.1:220 ../scripts/debi.1:115 ../scripts/debrelease.1:116 ../scripts/debsign.1:124 #, no-wrap msgid "B<DEBRELEASE_DEBS_DIR>" msgstr "" @@ -5279,8 +5373,8 @@ "parsechangelog> warning on the next invocation due to the lack of changes." msgstr "" -#. type: TP -#: ../scripts/debchange.1:213 ../scripts/mk-origtargz.pl:61 ../scripts/uscan.1:431 +#. type: =item +#: ../scripts/debchange.1:213 ../scripts/mk-origtargz.pl:70 ../scripts/uscan.pl:1317 #, no-wrap msgid "B<--package> I<package>" msgstr "" @@ -5422,7 +5516,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debchange.1:263 +#: ../scripts/debchange.1:263 ../scripts/uupdate.1:66 msgid "" "Force a version number to be less than the current one (e.g., when " "backporting)." @@ -5722,7 +5816,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debchange.1:392 ../scripts/debclean.1:90 ../scripts/debrelease.1:105 ../scripts/debsign.1:106 ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:42 ../scripts/nmudiff.1:79 ../scripts/pts-subscribe.1:34 ../scripts/uupdate.1:91 ../scripts/who-uploads.1:50 +#: ../scripts/debchange.1:392 ../scripts/debclean.1:90 ../scripts/debrelease.1:105 ../scripts/debsign.1:106 ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:42 ../scripts/nmudiff.1:79 ../scripts/pts-subscribe.1:34 ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 msgid "Display version and copyright information and exit successfully." msgstr "" @@ -6574,7 +6668,7 @@ msgstr "" #. type: TP -#: ../scripts/debcommit.pl:71 ../scripts/dget.pl:597 ../scripts/dpkg-depcheck.1:16 +#: ../scripts/debcommit.pl:71 ../scripts/dget.pl:596 ../scripts/dpkg-depcheck.1:16 #, no-wrap msgid "B<-a>, B<--all>" msgstr "" @@ -6731,7 +6825,7 @@ msgstr "" #. type: =item -#: ../scripts/debcommit.pl:158 +#: ../scripts/debcommit.pl:158 ../scripts/uscan.pl:350 msgid "B<git>" msgstr "" @@ -6778,7 +6872,7 @@ msgstr "" #. type: textblock -#: ../scripts/debcommit.pl:904 +#: ../scripts/debcommit.pl:902 msgid "" "This code is copyright by Joey Hess <joeyh@debian.org>, all rights reserved. " " This program comes with ABSOLUTELY NO WARRANTY. You are free to " @@ -6787,12 +6881,12 @@ msgstr "" #. type: textblock -#: ../scripts/debcommit.pl:911 ../scripts/mass-bug.pl:525 +#: ../scripts/debcommit.pl:909 ../scripts/mass-bug.pl:525 msgid "Joey Hess <joeyh@debian.org>" msgstr "" #. type: textblock -#: ../scripts/debcommit.pl:915 +#: ../scripts/debcommit.pl:913 msgid "B<debchange>(1), B<svnpath>(1)" msgstr "" @@ -6845,7 +6939,7 @@ "lost between revisions of the package. It also checks the file owners and " "permissions, and compares the control files of the two packages using the " "B<wdiff> program. If you want a deeper comparison of two Debian package " -"files you can use the B<debbindiff> tool." +"files you can use the B<diffoscope> tool." msgstr "" #. type: Plain text @@ -6921,7 +7015,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:72 +#: ../scripts/debdiff.1:73 msgid "" "It sometimes occurs that various files or directories are moved around " "between revisions. This can be handled using this option. There are two " @@ -6930,17 +7024,18 @@ "whose names begin with the first argument are treated as having that " "substituted for the second argument when the file lists are compared. Any " "number of B<--move> arguments may be given; they are processed in the order " -"in which they appear." +"in which they appear. This only affects comparing binary packages, not " +"source packages." msgstr "" #. type: TP -#: ../scripts/debdiff.1:72 +#: ../scripts/debdiff.1:73 #, no-wrap msgid "B<--move-regex>I< FROM TO>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:78 +#: ../scripts/debdiff.1:79 msgid "" "This is the same as B<--move>, except that I<FROM> is treated as a regular " "expression and the B<perl> substitution command I<s/^FROM/TO/> is applied to " @@ -6948,39 +7043,39 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:78 +#: ../scripts/debdiff.1:79 #, no-wrap msgid "B<--nocontrol>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:83 +#: ../scripts/debdiff.1:84 msgid "" "B<debdiff> will usually compare the respective control files of the packages " "using B<wdiff>(1). This option suppresses this part of the processing." msgstr "" #. type: TP -#: ../scripts/debdiff.1:83 +#: ../scripts/debdiff.1:84 #, no-wrap msgid "B<--control>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:87 +#: ../scripts/debdiff.1:88 msgid "" "Compare the respective control files; this is the default, and it can be " "used to override a configuration file setting." msgstr "" #. type: TP -#: ../scripts/debdiff.1:87 +#: ../scripts/debdiff.1:88 #, no-wrap msgid "B<--controlfiles>I< FILE>[B<,>I<FILE> ...]" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:95 +#: ../scripts/debdiff.1:96 msgid "" "Specify which control files to compare; by default this is just I<control>, " "but could include I<postinst>, I<config> and so on. Files will only be " @@ -6990,52 +7085,52 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:95 +#: ../scripts/debdiff.1:96 #, no-wrap msgid "B<--wdiff-source-control>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:99 +#: ../scripts/debdiff.1:100 msgid "" "When processing source packages, compare control files using B<wdiff>. " "Equivalent to the B<--control> option for binary packages." msgstr "" #. type: TP -#: ../scripts/debdiff.1:99 +#: ../scripts/debdiff.1:100 #, no-wrap msgid "B<--no-wdiff-source-control>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:103 +#: ../scripts/debdiff.1:104 msgid "" "Do not compare control files in source packages using B<wdfiff>. This is " "the default." msgstr "" #. type: TP -#: ../scripts/debdiff.1:103 +#: ../scripts/debdiff.1:104 #, no-wrap msgid "B<--wp>, B<--wl>, B<--wt>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:108 +#: ../scripts/debdiff.1:109 msgid "" "Pass a B<-p>, B<-l> or B<-t> option to B<wdiff> respectively. (This yields " "the whole B<wdiff> output rather than just the lines with any changes.)" msgstr "" #. type: TP -#: ../scripts/debdiff.1:108 +#: ../scripts/debdiff.1:109 #, no-wrap msgid "B<--show-moved>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:115 +#: ../scripts/debdiff.1:116 msgid "" "If multiple I<.deb> files are specified on the command line, either using " "I<.changes> files or the B<--from>/B<--to> syntax, then this option will " @@ -7044,25 +7139,25 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:115 +#: ../scripts/debdiff.1:116 #, no-wrap msgid "B<--noshow-moved>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:119 ../scripts/debdiff.1:136 +#: ../scripts/debdiff.1:120 ../scripts/debdiff.1:137 msgid "" "The default behaviour; can be used to override a configuration file setting." msgstr "" #. type: TP -#: ../scripts/debdiff.1:119 +#: ../scripts/debdiff.1:120 #, no-wrap msgid "B<--renamed>I< FROM TO>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:125 +#: ../scripts/debdiff.1:126 msgid "" "If B<--show-moved> is being used and a package has been renamed in the " "process, this command instructs B<debdiff> to treat the package in the first " @@ -7071,54 +7166,54 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:125 +#: ../scripts/debdiff.1:126 #, no-wrap msgid "B<--exclude>I< PATTERN>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:129 +#: ../scripts/debdiff.1:130 msgid "" "Exclude files that match I<PATTERN>. Multiple uses of this option are " "permitted." msgstr "" #. type: TP -#: ../scripts/debdiff.1:129 +#: ../scripts/debdiff.1:130 #, no-wrap msgid "B<--diffstat>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:132 +#: ../scripts/debdiff.1:133 msgid "Include the result of B<diffstat> before the generated diff." msgstr "" #. type: TP -#: ../scripts/debdiff.1:132 +#: ../scripts/debdiff.1:133 #, no-wrap msgid "B<--no-diffstat>" msgstr "" #. type: TP -#: ../scripts/debdiff.1:136 +#: ../scripts/debdiff.1:137 #, no-wrap msgid "B<--auto-ver-sort>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:139 +#: ../scripts/debdiff.1:140 msgid "When comparing source packages, do so in version order." msgstr "" #. type: TP -#: ../scripts/debdiff.1:139 +#: ../scripts/debdiff.1:140 #, no-wrap msgid "B<--no-auto-ver-sort>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:145 +#: ../scripts/debdiff.1:146 msgid "" "Compare source packages in the order they were passed on the command-line, " "even if that means comparing a package with a higher version against one " @@ -7126,13 +7221,13 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:145 +#: ../scripts/debdiff.1:146 #, no-wrap msgid "B<--unpack-tarballs>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:150 +#: ../scripts/debdiff.1:151 msgid "" "When comparing source packages, also unpack tarballs found in the top level " "source directory to compare their contents along with the other files. This " @@ -7140,18 +7235,18 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:150 +#: ../scripts/debdiff.1:151 #, no-wrap msgid "B<--no-unpack-tarballs>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:153 +#: ../scripts/debdiff.1:154 msgid "Do not unpack tarballs inside source packages." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:163 +#: ../scripts/debdiff.1:164 msgid "" "Look for the I<.dsc> files in I<directory> instead of the parent of the " "source directory. This should either be an absolute path or relative to the " @@ -7159,29 +7254,29 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:169 +#: ../scripts/debdiff.1:170 #, no-wrap msgid "B<--quiet>, B<-q>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:172 +#: ../scripts/debdiff.1:173 msgid "Be quiet if no differences were found." msgstr "" #. type: TP -#: ../scripts/debdiff.1:172 +#: ../scripts/debdiff.1:173 #, no-wrap msgid "B<--ignore-space>, B<-w>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:175 +#: ../scripts/debdiff.1:176 msgid "Ignore whitespace in diffs." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:181 +#: ../scripts/debdiff.1:182 msgid "" "The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. Command " @@ -7191,124 +7286,124 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:181 +#: ../scripts/debdiff.1:182 #, no-wrap msgid "B<DEBDIFF_DIRS>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:185 +#: ../scripts/debdiff.1:186 msgid "" "If this is set to I<yes>, then it is the same as the B<--dirs> command line " "parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:185 +#: ../scripts/debdiff.1:186 #, no-wrap msgid "B<DEBDIFF_CONTROL>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:190 +#: ../scripts/debdiff.1:191 msgid "" "If this is set to I<no>, then it is the same as the B<--nocontrol> command " "line parameter being used. The default is I<yes>." msgstr "" #. type: TP -#: ../scripts/debdiff.1:190 +#: ../scripts/debdiff.1:191 #, no-wrap msgid "B<DEBDIFF_CONTROLFILES>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:195 +#: ../scripts/debdiff.1:196 msgid "" "Which control files to compare, corresponding to the B<--controlfiles> " "command line option. The default is I<control>." msgstr "" #. type: TP -#: ../scripts/debdiff.1:195 +#: ../scripts/debdiff.1:196 #, no-wrap msgid "B<DEBDIFF_SHOW_MOVED>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:199 +#: ../scripts/debdiff.1:200 msgid "" "If this is set to I<yes>, then it is the same as the B<--show-moved> command " "line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:199 +#: ../scripts/debdiff.1:200 #, no-wrap msgid "B<DEBDIFF_WDIFF_OPT>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:203 +#: ../scripts/debdiff.1:204 msgid "" "This option will be passed to B<wdiff>; it should be one of B<-p>, B<-l> or " "B<-t>." msgstr "" #. type: TP -#: ../scripts/debdiff.1:203 +#: ../scripts/debdiff.1:204 #, no-wrap msgid "B<DEBDIFF_SHOW_DIFFSTAT>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:207 +#: ../scripts/debdiff.1:208 msgid "" "If this is set to I<yes>, then it is the same as the B<--diffstat> command " "line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:207 +#: ../scripts/debdiff.1:208 #, no-wrap msgid "B<DEBDIFF_WDIFF_SOURCE_CONTROL>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:211 +#: ../scripts/debdiff.1:212 msgid "" "If this is set to I<yes>, then it is the same as the B<--wdiff-source-" "control> command line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:211 +#: ../scripts/debdiff.1:212 #, no-wrap msgid "B<DEBDIFF_AUTO_VER_SORT>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:215 +#: ../scripts/debdiff.1:216 msgid "" "If this is set to I<yes>, then it is the same as the B<--auto-ver-sort> " "command line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:215 +#: ../scripts/debdiff.1:216 #, no-wrap msgid "B<DEBDIFF_UNPACK_TARBALLS>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:219 +#: ../scripts/debdiff.1:220 msgid "" "If this is set to I<no>, then it is the same as the B<--no-unpack-tarballs> " "command line parameter being used." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:229 +#: ../scripts/debdiff.1:230 msgid "" "This specifies the directory in which to look for the I<.dsc> and files, and " "is either an absolute path or relative to the top of the source tree. This " @@ -7319,21 +7414,21 @@ msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:233 +#: ../scripts/debdiff.1:234 msgid "" "Normally the exit value will be 0 if no differences are reported and 1 if " "any are reported. If there is some fatal error, the exit code will be 255." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:240 +#: ../scripts/debdiff.1:241 msgid "" "B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), " -"B<devscripts.conf>(5), B<debbindiff>(1)" +"B<devscripts.conf>(5), B<diffoscope>(1)" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:245 +#: ../scripts/debdiff.1:246 msgid "" "B<debdiff> was originally written as a shell script by Yann Dirson " "E<lt>dirson@debian.orgE<gt> and rewritten in Perl with many more features by " @@ -8154,7 +8249,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debrsign.1:72 ../scripts/debsign.1:147 +#: ../scripts/debrsign.1:72 ../scripts/debsign.1:148 msgid "" "This program was written by Julian Gilbey E<lt>jdg@debian.orgE<gt> and is " "copyright under the GPL, version 2 or later." @@ -8384,11 +8479,11 @@ msgstr "" #. type: Plain text -#: ../scripts/debsign.1:145 +#: ../scripts/debsign.1:146 msgid "" "B<debrsign>(1), B<debuild>(1), B<dpkg-architecture>(1), B<dpkg-" -"buildpackage>(1), B<gpg>(1), B<md5sum>(1), B<sha1sum>(1), B<sha256sum>(1), " -"B<scp>(1), B<devscripts.conf>(5)" +"buildpackage>(1), B<gpg>(1), B<gpg2>(1), B<md5sum>(1), B<sha1sum>(1), " +"B<sha256sum>(1), B<scp>(1), B<devscripts.conf>(5)" msgstr "" #. type: TH @@ -8496,65 +8591,104 @@ #. type: TP #: ../scripts/debsnap.1:47 #, no-wrap -msgid "B<--binary>" +msgid "B<--list>" msgstr "" #. type: Plain text #: ../scripts/debsnap.1:50 -msgid "Download binary packages instead of source packages." +msgid "Don't dwnload but just list versions." msgstr "" #. type: TP #: ../scripts/debsnap.1:51 #, no-wrap +msgid "B<--binary>" +msgstr "" + +#. type: Plain text +#: ../scripts/debsnap.1:54 +msgid "Download binary packages instead of source packages." +msgstr "" + +#. type: TP +#: ../scripts/debsnap.1:55 +#, no-wrap msgid "B<-a>, B<--architecture>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:56 +#: ../scripts/debsnap.1:60 msgid "" "Specify architecture of downloaded binary packages. Implies B<--binary>. " "This can be given multiple times in order to download binary packages for " "multiple architectures." msgstr "" +#. type: TP +#: ../scripts/debsnap.1:61 +#, no-wrap +msgid "B<--first>" +msgstr "" + #. type: Plain text -#: ../scripts/debsnap.1:60 +#: ../scripts/debsnap.1:66 +msgid "" +"Specify the minimum version of a package which will be downloaded. Any " +"versions which compare larger than this, according to B<dpkg>, will be " +"considered for download. May be used in combination with B<--last>." +msgstr "" + +#. type: TP +#: ../scripts/debsnap.1:67 +#, no-wrap +msgid "B<--last>" +msgstr "" + +#. type: Plain text +#: ../scripts/debsnap.1:72 +msgid "" +"Specify the maximum version of a package which will be downloaded. Any " +"package versions which compare less than this, according to B<dpkg>, will be " +"considered for download. May be used in combination with B<--first>." +msgstr "" + +#. type: Plain text +#: ../scripts/debsnap.1:76 msgid "Show a summary of these options." msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:64 +#: ../scripts/debsnap.1:80 msgid "Show the version of B<debsnap>." msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:69 +#: ../scripts/debsnap.1:85 msgid "" "B<debsnap> may also be configured through the use of the following options " "in the devscripts configuration files:" msgstr "" #. type: TP -#: ../scripts/debsnap.1:70 +#: ../scripts/debsnap.1:86 #, no-wrap msgid "B<DEBSNAP_VERBOSE>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:73 +#: ../scripts/debsnap.1:89 msgid "" "Same as the command line option B<--verbose>. Set to I<yes> to enable." msgstr "" #. type: TP -#: ../scripts/debsnap.1:74 +#: ../scripts/debsnap.1:90 #, no-wrap msgid "B<DEBSNAP_DESTDIR>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:79 +#: ../scripts/debsnap.1:95 msgid "" "Set a default path for the destination directory. If unset I<./source-" "E<lt>package_nameE<gt>> will be used. The command line option B<--destdir> " @@ -8562,29 +8696,29 @@ msgstr "" #. type: TP -#: ../scripts/debsnap.1:80 +#: ../scripts/debsnap.1:96 #, no-wrap msgid "B<DEBSNAP_BASE_URL>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:83 +#: ../scripts/debsnap.1:99 msgid "The base url for the snapshots archive." msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:85 +#: ../scripts/debsnap.1:101 msgid "If unset this defaults to I<http://snapshot.debian.org>" msgstr "" #. type: SH -#: ../scripts/debsnap.1:86 ../scripts/dscextract.1:20 ../scripts/transition-check.pl:54 ../scripts/uscan.1:548 ../scripts/wnpp-check.1:28 +#: ../scripts/debsnap.1:102 ../scripts/dscextract.1:20 ../scripts/transition-check.pl:54 ../scripts/uscan.pl:1498 ../scripts/wnpp-check.1:28 #, no-wrap msgid "EXIT STATUS" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:92 +#: ../scripts/debsnap.1:108 msgid "" "B<debsnap> will return an exit status of 0 if all operations succeeded, 1 if " "a fatal error occurred, and 2 if some packages failed to be downloaded but " @@ -8594,57 +8728,57 @@ msgstr "" #. type: TP -#: ../scripts/debsnap.1:94 +#: ../scripts/debsnap.1:110 #, no-wrap msgid "B<debsnap -a amd64 xterm 256-1>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:97 +#: ../scripts/debsnap.1:113 msgid "" "Download the binary package of a specific xterm version for amd64 " "architecture." msgstr "" #. type: TP -#: ../scripts/debsnap.1:97 +#: ../scripts/debsnap.1:113 #, no-wrap msgid "B<debsnap -a armel xterm>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:100 +#: ../scripts/debsnap.1:116 msgid "" "Download binary packages for all versions of xterm for armel architecture." msgstr "" #. type: TP -#: ../scripts/debsnap.1:100 +#: ../scripts/debsnap.1:116 #, no-wrap msgid "B<debsnap --binary xterm 256-1>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:103 +#: ../scripts/debsnap.1:119 msgid "" "Download binary packages for a specific xterm version but for all " "architectures." msgstr "" #. type: TP -#: ../scripts/debsnap.1:103 +#: ../scripts/debsnap.1:119 #, no-wrap msgid "B<debsnap --binary xterm>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:106 +#: ../scripts/debsnap.1:122 msgid "" "Download binary packages for all versions of xterm for all architectures." msgstr "" #. type: TP -#: ../scripts/debsnap.1:106 +#: ../scripts/debsnap.1:122 #, no-wrap msgid "" "B<aptitude search '~i' -F '%p %V' | while read pkg ver; do debsnap -a $(dpkg-" @@ -8652,58 +8786,58 @@ msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:109 +#: ../scripts/debsnap.1:125 msgid "" "Download binary packages of all packages that are installed on the system." msgstr "" #. type: SH -#: ../scripts/debsnap.1:110 ../scripts/diff2patches.1:28 +#: ../scripts/debsnap.1:126 ../scripts/diff2patches.1:28 #, no-wrap msgid "FILES" msgstr "" #. type: TP -#: ../scripts/debsnap.1:111 +#: ../scripts/debsnap.1:127 #, no-wrap msgid "I</etc/devscripts.conf>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:114 +#: ../scripts/debsnap.1:130 msgid "" "Global devscripts configuration options. Will override hardcoded defaults." msgstr "" #. type: TP -#: ../scripts/debsnap.1:114 +#: ../scripts/debsnap.1:130 #, no-wrap msgid "I<~/.devscripts>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:122 +#: ../scripts/debsnap.1:138 msgid "B<devscripts>(1), B<devscripts.conf>(5), B<git-debimport>(1)" msgstr "" #. type: SH -#: ../scripts/debsnap.1:123 ../doc/edit-patch.1:37 ../doc/suspicious-source.1:51 ../doc/what-patch.1:27 ../doc/wrap-and-sort.1:81 +#: ../scripts/debsnap.1:139 ../doc/edit-patch.1:37 ../doc/suspicious-source.1:51 ../doc/what-patch.1:27 ../doc/wrap-and-sort.1:81 #, no-wrap msgid "AUTHORS" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:125 +#: ../scripts/debsnap.1:141 msgid "David Paleino E<lt>dapal@debian.orgE<gt>" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:128 +#: ../scripts/debsnap.1:144 msgid "Copyright \\(co 2010 David Paleino" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:132 +#: ../scripts/debsnap.1:148 msgid "" "Permission is granted to copy, distribute and/or modify this document under " "the terms of the GNU General Public License, Version 3 or (at your option) " @@ -8711,20 +8845,20 @@ msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:135 +#: ../scripts/debsnap.1:151 msgid "" "On Debian systems, the complete text of the GNU General Public License can " "be found in I</usr/share/common-licenses/GPL>." msgstr "" #. type: SS -#: ../scripts/debsnap.1:137 +#: ../scripts/debsnap.1:153 #, no-wrap msgid "Reporting bugs" msgstr "" #. type: Plain text -#: ../scripts/debsnap.1:140 +#: ../scripts/debsnap.1:156 msgid "" "The program is part of the devscripts package. Please report bugs using " "`B<reportbug devscripts>`" @@ -8816,7 +8950,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debuild.1:86 ../scripts/uscan.1:348 +#: ../scripts/debuild.1:86 msgid "" "The directory name is checked by testing whether the current directory name " "(as determined by B<pwd>(1)) matches the regex given by the configuration " @@ -8837,10 +8971,10 @@ "As environment variables can affect the building of a package, often " "unintentionally, B<debuild> sanitises the environment by removing all " "environment variables except for B<TERM>, B<HOME>, B<LOGNAME>, B<GNUPGHOME>, " -"B<PGPPATH>, B<GPG_AGENT_INFO>, B<FAKEROOTKEY>, B<DEB_>I<*>, the (B<C>, " -"B<CPP>, B<CXX>, B<LD> and B<F>)B<FLAGS> variables and their B<_APPEND> " -"counterparts and the locale variables B<LANG> and B<LC_>I<*>. B<TERM> is " -"set to `dumb' if it is unset, and B<PATH> is set to " +"B<PGPPATH>, B<GPG_AGENT_INFO>, B<DBUS_SESSION_BUS_ADDRESS>, B<FAKEROOTKEY>, " +"B<DEB_>I<*>, the (B<C>, B<CPP>, B<CXX>, B<LD> and B<F>)B<FLAGS> variables " +"and their B<_APPEND> counterparts and the locale variables B<LANG> and " +"B<LC_>I<*>. B<TERM> is set to `dumb' if it is unset, and B<PATH> is set to " "\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11\"." msgstr "" @@ -9753,7 +9887,8 @@ #. type: Plain text #: ../scripts/devscripts.1:39 msgid "" -"search for all packages that build-depend on a given package [dctrl-tools]" +"search for all packages that build-depend on a given package [dctrl-tools, " +"dose-extra]" msgstr "" #. type: IP @@ -9776,7 +9911,7 @@ #. type: Plain text #: ../scripts/devscripts.1:43 msgid "" -"check whether a /bin/sh script contains any common bash-specific contructs" +"check whether a /bin/sh script contains any common bash-specific constructs" msgstr "" #. type: IP @@ -9828,7 +9963,7 @@ #: ../scripts/devscripts.1:51 msgid "" "wrapper for cvs-buildpackage to use debuild as its package building program " -"[cvs-buildpackage, fakeroot, lintian, gnupg]" +"[cvs-buildpackage, fakeroot, lintian, gnupg | gnupg2]" msgstr "" #. type: IP @@ -9938,7 +10073,7 @@ #: ../scripts/devscripts.1:69 msgid "" "compare two versions of a Debian package to check for added and removed " -"files. Use the debbindiff package for deep comparisons. [wdiff, patchutils]" +"files. Use the diffoscope package for deep comparisons. [wdiff, patchutils]" msgstr "" #. type: IP @@ -9985,7 +10120,7 @@ msgid "" "sign a .changes/.dsc pair without needing any of the rest of the package to " "be present; can sign the pair remotely or fetch the pair from a remote " -"machine for signing [gnupg, debian-keyring, ssh-client]" +"machine for signing [gnupg | gnupg2, debian-keyring, ssh-client]" msgstr "" #. type: IP @@ -9996,8 +10131,7 @@ #. type: Plain text #: ../scripts/devscripts.1:79 -msgid "" -"grab packages from http://snapshot.debian.org [libwww-perl, libjson-perl]" +msgid "grab packages from http://snapshot.debian.org [libwww-perl]" msgstr "" #. type: IP @@ -10011,7 +10145,7 @@ msgid "" "wrapper to build a package without having to su or worry about how to invoke " "dpkg to build using fakeroot. Also deals with common environment problems, " -"umask etc. [fakeroot, lintian, gnupg]" +"umask etc. [fakeroot, lintian, gnupg | gnupg2]" msgstr "" #. type: IP @@ -10109,7 +10243,7 @@ #: ../scripts/devscripts.1:97 msgid "" "verify the integrity of a Debian package from the .changes or .dsc files " -"[gnupg, debian-keyring, libdigest-md5-perl]" +"[gnupg | gnupg2, debian-keyring, libdigest-md5-perl]" msgstr "" #. type: IP @@ -10388,8 +10522,8 @@ #. type: Plain text #: ../scripts/devscripts.1:143 msgid "" -"scan upstream sites for new releases of packages [gpgv, gnupg, liblwp-" -"protocol-https-perl, libwww-perl, unzip, xz-utils, file]" +"scan upstream sites for new releases of packages [gpgv | gpgv2, gnupg " +"|gnupg2, liblwp-protocol-https-perl, libwww-perl, unzip, xz-utils, file]" msgstr "" #. type: IP @@ -10436,7 +10570,7 @@ #: ../scripts/devscripts.1:151 msgid "" "determine the most recent uploaders of a package to the Debian archive " -"[gnupg, debian-keyring, debian-maintainers, wget]" +"[gnupg | gnupg2, debian-keyring, debian-maintainers, wget]" msgstr "" #. type: IP @@ -10473,8 +10607,8 @@ #. type: Plain text #: ../scripts/devscripts.1:157 msgid "" -"Retrieve information about Debian Maintainer access control lists [gnupg, " -"libencode-locale-perl, libwww-perl, debian-keyring]" +"Retrieve information about Debian Maintainer access control lists [gnupg | " +"gnupg2, libencode-locale-perl, libwww-perl, debian-keyring]" msgstr "" #. type: IP @@ -10489,22 +10623,22 @@ msgstr "" #. type: textblock -#: ../scripts/dget.pl:540 +#: ../scripts/dget.pl:539 msgid "dget -- Download Debian source and binary packages" msgstr "" #. type: =item -#: ../scripts/dget.pl:546 +#: ../scripts/dget.pl:545 msgid "B<dget> [I<options>] I<URL> ..." msgstr "" #. type: =item -#: ../scripts/dget.pl:548 +#: ../scripts/dget.pl:547 msgid "B<dget> [I<options>] [B<--all>] I<package>[B<=>I<version>] ..." msgstr "" #. type: textblock -#: ../scripts/dget.pl:554 +#: ../scripts/dget.pl:553 msgid "" "B<dget> downloads Debian packages. In the first form, B<dget> fetches the " "requested URLs. If this is a .dsc or .changes file, then B<dget> acts as a " @@ -10514,7 +10648,7 @@ msgstr "" #. type: textblock -#: ../scripts/dget.pl:561 +#: ../scripts/dget.pl:560 msgid "" "In the second form, B<dget> downloads a I<binary> package (i.e., a I<.deb> " "file) from the Debian mirror configured in /etc/apt/sources.list(.d). " @@ -10526,14 +10660,14 @@ msgstr "" #. type: textblock -#: ../scripts/dget.pl:570 +#: ../scripts/dget.pl:569 msgid "" "In both cases dget is capable of getting several packages and/or URLs at " "once." msgstr "" #. type: textblock -#: ../scripts/dget.pl:573 +#: ../scripts/dget.pl:572 msgid "" "(Note that I<.udeb> packages used by debian-installer are located in " "separate packages files from I<.deb> packages. In order to use I<.udebs> " @@ -10542,7 +10676,7 @@ msgstr "" #. type: textblock -#: ../scripts/dget.pl:578 +#: ../scripts/dget.pl:577 msgid "" "Before downloading files listed in .dsc and .changes files, and before " "downloading binary packages, B<dget> checks to see whether any of these " @@ -10556,7 +10690,7 @@ msgstr "" #. type: textblock -#: ../scripts/dget.pl:588 +#: ../scripts/dget.pl:587 msgid "" "B<dget> was written to make it easier to retrieve source packages from the " "web for sponsor uploads. For checking the package with B<debdiff>, the last " @@ -10565,7 +10699,7 @@ msgstr "" #. type: textblock -#: ../scripts/dget.pl:599 +#: ../scripts/dget.pl:598 msgid "" "Interpret I<package> as a source package name, and download all binaries as " "found in the output of \"apt-cache showsrc I<package>\". If I<package> is " @@ -10574,39 +10708,39 @@ msgstr "" #. type: =item -#: ../scripts/dget.pl:604 +#: ../scripts/dget.pl:603 msgid "B<-b>, B<--backup>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:606 +#: ../scripts/dget.pl:605 msgid "Move files that would be overwritten to I<./backup>." msgstr "" #. type: textblock -#: ../scripts/dget.pl:610 +#: ../scripts/dget.pl:609 msgid "Suppress B<wget>/B<curl> non-error output." msgstr "" #. type: =item -#: ../scripts/dget.pl:612 ../scripts/origtargz.pl:129 +#: ../scripts/dget.pl:611 ../scripts/origtargz.pl:129 msgid "B<-d>, B<--download-only>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:614 +#: ../scripts/dget.pl:613 msgid "" "Do not run B<dpkg-source -x> on the downloaded source package. This can " "only be used with the first method of calling B<dget>." msgstr "" #. type: =item -#: ../scripts/dget.pl:617 +#: ../scripts/dget.pl:616 msgid "B<-x>, B<--extract>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:619 +#: ../scripts/dget.pl:618 msgid "" "Run B<dpkg-source -x> on the downloaded source package to unpack it. This " "option is the default and can only be used with the first method of calling " @@ -10614,34 +10748,34 @@ msgstr "" #. type: =item -#: ../scripts/dget.pl:623 +#: ../scripts/dget.pl:622 msgid "B<-u>, B<--allow-unauthenticated>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:625 +#: ../scripts/dget.pl:624 msgid "" "Do not attempt to verify the integrity of downloaded source packages using " "B<dscverify>." msgstr "" #. type: =item -#: ../scripts/dget.pl:628 +#: ../scripts/dget.pl:627 msgid "B<--build>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:630 +#: ../scripts/dget.pl:629 msgid "Run B<dpkg-buildpackage -b -uc> on the downloaded source package." msgstr "" #. type: =item -#: ../scripts/dget.pl:632 +#: ../scripts/dget.pl:631 msgid "B<--path> I<DIR>[B<:>I<DIR> ...]" msgstr "" #. type: textblock -#: ../scripts/dget.pl:634 +#: ../scripts/dget.pl:633 msgid "" "In addition to I</var/cache/apt/archives>, B<dget> uses the colon-separated " "list given as argument to B<--path> to find files with a matching md5sum. " @@ -10654,33 +10788,33 @@ msgstr "" #. type: =item -#: ../scripts/dget.pl:645 +#: ../scripts/dget.pl:644 msgid "B<--insecure>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:647 +#: ../scripts/dget.pl:646 msgid "Allow SSL connections to untrusted hosts." msgstr "" #. type: =item -#: ../scripts/dget.pl:649 +#: ../scripts/dget.pl:648 msgid "B<--no-cache>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:651 +#: ../scripts/dget.pl:650 msgid "" "Bypass server-side HTTP caches by sending a B<Pragma: no-cache> header." msgstr "" #. type: =item -#: ../scripts/dget.pl:673 +#: ../scripts/dget.pl:672 msgid "B<DGET_PATH>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:675 +#: ../scripts/dget.pl:674 msgid "" "This can be set to a colon-separated list of directories in which to search " "for files in addition to the default I</var/cache/apt/archives>. It has the " @@ -10688,38 +10822,38 @@ msgstr "" #. type: =item -#: ../scripts/dget.pl:680 +#: ../scripts/dget.pl:679 msgid "B<DGET_UNPACK>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:682 +#: ../scripts/dget.pl:681 msgid "" "Set to 'no' to disable extracting downloaded source packages. Default is " "'yes'." msgstr "" #. type: =item -#: ../scripts/dget.pl:685 +#: ../scripts/dget.pl:684 msgid "B<DGET_VERIFY>" msgstr "" #. type: textblock -#: ../scripts/dget.pl:687 +#: ../scripts/dget.pl:686 msgid "" "Set to 'no' to disable checking signatures of downloaded source packages. " "Default is 'yes'." msgstr "" #. type: textblock -#: ../scripts/dget.pl:694 +#: ../scripts/dget.pl:693 msgid "" "Download all I<.deb> files for the previous version of a package and run " "B<debdiff> on them:" msgstr "" #. type: verbatim -#: ../scripts/dget.pl:697 +#: ../scripts/dget.pl:696 #, no-wrap msgid "" " dget --all mypackage=1.2-1\n" @@ -10728,31 +10862,31 @@ msgstr "" #. type: =head1 -#: ../scripts/dget.pl:700 +#: ../scripts/dget.pl:699 msgid "BUGS AND COMPATIBILITY" msgstr "" #. type: textblock -#: ../scripts/dget.pl:702 +#: ../scripts/dget.pl:701 msgid "B<dget> I<package> should be implemented in B<apt-get install -d>." msgstr "" #. type: textblock -#: ../scripts/dget.pl:704 +#: ../scripts/dget.pl:703 msgid "" "Before devscripts version 2.10.17, the default was not to extract the " "downloaded source. Set DGET_UNPACK=no to revert to the old behaviour." msgstr "" #. type: textblock -#: ../scripts/dget.pl:709 +#: ../scripts/dget.pl:708 msgid "" "This program is Copyright (C) 2005-2013 by Christoph Berg <myon@debian.org>. " " Modifications are Copyright (C) 2005-06 by Julian Gilbey <jdg@debian.org>." msgstr "" #. type: textblock -#: ../scripts/dget.pl:717 +#: ../scripts/dget.pl:716 msgid "" "B<apt-get>(1), B<curl>(1), B<debcheckout>(1), B<debdiff>(1), B<dpkg-" "source>(1), B<wget>(1)" @@ -11414,7 +11548,7 @@ msgstr "" #. type: TP -#: ../scripts/dscextract.1:21 ../scripts/uscan.1:552 ../scripts/wnpp-check.1:29 +#: ../scripts/dscextract.1:21 ../scripts/wnpp-check.1:29 #, no-wrap msgid "0" msgstr "" @@ -11511,7 +11645,7 @@ msgstr "" #. type: TP -#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 ../scripts/uscan.1:459 ../scripts/uupdate.1:74 +#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 ../scripts/uupdate.1:98 #, no-wrap msgid "B<--verbose>" msgstr "" @@ -11605,12 +11739,12 @@ msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:78 -msgid "B<gpg>(1), B<devscripts.conf>(5)" +#: ../scripts/dscverify.1:79 +msgid "B<gpg>(1), B<gpg2>(1), B<devscripts.conf>(5)" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:82 +#: ../scripts/dscverify.1:83 msgid "" "B<dscverify> was written by Roderick Schertler E<lt>roderick@argon.orgE<gt> " "and posted on the debian-devel@lists.debian.org mailing list, with several " @@ -11762,7 +11896,7 @@ msgstr "" #. type: TP -#: ../scripts/grep-excuses.1:32 ../scripts/uscan.1:469 +#: ../scripts/grep-excuses.1:32 #, no-wrap msgid "B<--debug>" msgstr "" @@ -11812,8 +11946,8 @@ msgid "" "B<licensecheck> [B<--no-conf>] [B<--verbose>] [B<--copyright>] [B<-l>|B<--" "lines=>I<N>] [B<-i>|B<--ignore=>I<regex>] [B<-c>|B<--check=>I<regex>] [B<-" -"m>|B<--machine>] [B<-r>|B<--recursive>] I<list of files and directories to " -"check>" +"m>|B<--machine>] [B<-r>|B<--recursive>] [B<-e>|B<--encoding=>I<...>] I<list " +"of files and directories to check>" msgstr "" #. type: textblock @@ -11862,102 +11996,140 @@ #. type: =item #: ../scripts/licensecheck.pl:61 -msgid "B<-i=>I<regex>, B<--ignore=>I<regex>" +msgid "B<--tail=>I<N>" msgstr "" #. type: textblock #: ../scripts/licensecheck.pl:63 msgid "" +"By default, the last 5k bytes of each files are parsed to get license " +"information. You may use this option to set the size of this parsed chunk. " +"You may set this value to 0 to avoid parsing the end of the file." +msgstr "" + +#. type: =item +#: ../scripts/licensecheck.pl:67 +msgid "B<-i=>I<regex>, B<--ignore=>I<regex>" +msgstr "" + +#. type: textblock +#: ../scripts/licensecheck.pl:69 +msgid "" "When processing the list of files and directories, the regular expression " "specified by this option will be used to indicate those which should not be " "considered (e.g. backup files, VCS metadata)." msgstr "" #. type: =item -#: ../scripts/licensecheck.pl:67 +#: ../scripts/licensecheck.pl:73 msgid "B<-r>, B<--recursive>" msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:69 +#: ../scripts/licensecheck.pl:75 msgid "Specify that the contents of directories should be added recursively." msgstr "" #. type: =item -#: ../scripts/licensecheck.pl:72 +#: ../scripts/licensecheck.pl:78 msgid "B<-c=>I<regex>, B<--check=>I<regex>" msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:74 +#: ../scripts/licensecheck.pl:80 msgid "" "Specify a pattern against which filenames will be matched in order to decide " "which files to check the license of." msgstr "" +#. type: textblock +#: ../scripts/licensecheck.pl:83 +msgid "The default includes common source files." +msgstr "" + #. type: =item -#: ../scripts/licensecheck.pl:77 -msgid "B<-t>, B<--text>" +#: ../scripts/licensecheck.pl:85 +msgid "B<-s>, B<--skipped>" +msgstr "" + +#. type: textblock +#: ../scripts/licensecheck.pl:87 +msgid "" +"Specify whether to show skipped files, i.e. files found which do not match " +"the check regexp (see C<--check> option). Default is to not show skipped " +"files." msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:79 +#: ../scripts/licensecheck.pl:91 msgid "" -"By default, all files are parsed, including binary files. This option limits " -"the parsed files to mime type C<text/*> and C<application/xml>. The mime " -"type is given by C<file> command." +"Note that ignored files (like C<.git> or C<.svn>) are not shown even when " +"this option is used." msgstr "" #. type: =item -#: ../scripts/licensecheck.pl:83 +#: ../scripts/licensecheck.pl:94 msgid "B<--copyright>" msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:85 +#: ../scripts/licensecheck.pl:96 msgid "Also display copyright text found within the file" msgstr "" #. type: =item -#: ../scripts/licensecheck.pl:87 -msgid "B<-m>, B<--machine>" +#: ../scripts/licensecheck.pl:98 +msgid "B<-e> B<--encoding>" msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:89 +#: ../scripts/licensecheck.pl:100 msgid "" -"Display the information in a machine readable way, i.e. in the form " -"<file><tab><license>[<tab><copyright>] so that it can be easily sorted " -"and/or filtered, e.g. with the B<awk> and B<sort> commands. Note that using " +"Specifies input encoding of source files. By default, input files are not " +"decoded. When encoding is specified, license and copyright information are " +"printed on STDOUT as utf8, or garbage if you got the encoding wrong." +msgstr "" + +#. type: =item +#: ../scripts/licensecheck.pl:105 +msgid "B<-m>, B<--machine>" +msgstr "" + +#. type: textblock +#: ../scripts/licensecheck.pl:107 +msgid "" +"Display the information in a machine readable way, i.e. in the form " +"<file><tab><license>[<tab><copyright>] so that it can be easily sorted " +"and/or filtered, e.g. with the B<awk> and B<sort> commands. Note that using " "the B<--verbose> option will kill the readability." msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:96 +#: ../scripts/licensecheck.pl:114 msgid "" "Do not read any configuration files. This can only be used as the first " "option given on the command line." msgstr "" #. type: =item -#: ../scripts/licensecheck.pl:111 +#: ../scripts/licensecheck.pl:129 msgid "B<LICENSECHECK_VERBOSE>" msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:113 +#: ../scripts/licensecheck.pl:131 msgid "" "If this is set to I<yes>, then it is the same as the B<--verbose> command " "line parameter being used. The default is I<no>." msgstr "" #. type: =item -#: ../scripts/licensecheck.pl:116 +#: ../scripts/licensecheck.pl:134 msgid "B<LICENSECHECK_PARSELINES>" msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:118 +#: ../scripts/licensecheck.pl:136 msgid "" "If this is set to a positive number then the specified number of lines at " "the start of each file will be read whilst attempting to determine the " @@ -11965,7 +12137,7 @@ msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:127 +#: ../scripts/licensecheck.pl:145 msgid "" "This code is copyright by Adam D. Barratt <I<adam@adam-barratt.org.uk>>, all " "rights reserved; based on a script of the same name from the KDE SDK, which " @@ -11975,20 +12147,10 @@ msgstr "" #. type: textblock -#: ../scripts/licensecheck.pl:136 +#: ../scripts/licensecheck.pl:154 msgid "Adam D. Barratt <adam@adam-barratt.org.uk>" msgstr "" -#. type: =item -#: ../scripts/licensecheck.pl:142 ../scripts/origtargz.pl:46 ../scripts/origtargz.pl:50 ../scripts/origtargz.pl:54 ../scripts/origtargz.pl:58 ../scripts/origtargz.pl:62 -msgid "*" -msgstr "" - -#. type: textblock -#: ../scripts/licensecheck.pl:144 -msgid "L<file>" -msgstr "" - #. type: TH #: ../scripts/list-unreleased.1:1 #, no-wrap @@ -12061,35 +12223,70 @@ #. type: Plain text #: ../scripts/manpage-alert.1:6 -msgid "B<manpage-alert> [I<path list>]" -msgstr "" - -#. type: Plain text -#: ../scripts/manpage-alert.1:8 -msgid "B<manpage-alert --help>|B<--version>" +msgid "B<manpage-alert> [I<options>] [I<paths>]" msgstr "" #. type: Plain text -#: ../scripts/manpage-alert.1:11 +#: ../scripts/manpage-alert.1:9 msgid "" "B<manpage-alert> searches the given list of paths for binaries without " "corresponding manpages." msgstr "" #. type: Plain text -#: ../scripts/manpage-alert.1:14 +#: ../scripts/manpage-alert.1:12 msgid "" -"If no paths are specified on the command line, the path list I</bin /sbin " +"If no I<paths> are specified on the command line, the path list I</bin /sbin " "/usr/bin /usr/sbin /usr/games> will be assumed." msgstr "" +#. type: TP +#: ../scripts/manpage-alert.1:13 +#, no-wrap +msgid "B<-h>,B<--help>" +msgstr "" + +#. type: TP +#: ../scripts/manpage-alert.1:16 +#, no-wrap +msgid "B<-V>,B<--version>" +msgstr "" + +#. type: TP +#: ../scripts/manpage-alert.1:19 +#, no-wrap +msgid "B<-f>,B<--file>" +msgstr "" + #. type: Plain text -#: ../scripts/manpage-alert.1:17 -msgid "B<--help>, B<-h> Show a summary of options." +#: ../scripts/manpage-alert.1:22 +msgid "Show filenames of missing manpages without any leading text." +msgstr "" + +#. type: TP +#: ../scripts/manpage-alert.1:22 +#, no-wrap +msgid "B<-p>,B<--package>" msgstr "" #. type: Plain text #: ../scripts/manpage-alert.1:25 +msgid "Show filenames of missing manpages with their package name." +msgstr "" + +#. type: TP +#: ../scripts/manpage-alert.1:25 +#, no-wrap +msgid "B<-n>,B<--no-stat>" +msgstr "" + +#. type: Plain text +#: ../scripts/manpage-alert.1:28 +msgid "Do not show statistics at the end." +msgstr "" + +#. type: Plain text +#: ../scripts/manpage-alert.1:33 msgid "" "B<manpage-alert> was written by Branden Robinson and modified by Julian " "Gilbey E<lt>jdg@debian.orgE<gt> and Adam D. Barratt E<lt>debian-bts@adam-" @@ -12097,7 +12294,7 @@ msgstr "" #. type: Plain text -#: ../scripts/manpage-alert.1:28 +#: ../scripts/manpage-alert.1:35 msgid "" "This manpage and the associated program are licensed under the terms of the " "GPL, version 2 or later." @@ -12411,7 +12608,7 @@ #: ../scripts/mk-build-deps.pl:54 msgid "" "When installing the generated package use the specified tool. (default: " -"B<apt-get --no-install-recommends>)" +"B<apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends>)" msgstr "" #. type: =item @@ -12569,37 +12766,50 @@ "B<mk-origtargz> renames the given file to match what is expected by B<dpkg-" "buildpackage>, based on the source package name and version in " "F<debian/changelog>. It can convert B<zip> to B<tar>, optionally change the " -"compression scheme and remove files according to B<Files-Excluded> in " -"F<debian/copyright>. The resulting file is placed in F<debian/../..>." +"compression scheme and remove files according to B<Files-Excluded> and " +"B<Files-Excluded->I<component> in F<debian/copyright>. The resulting file is " +"placed in F<debian/../..>. (In F<debian/copyright>, the B<Files-Excluded> " +"and B<Files-Excluded->I<component> stanzas are a part of the first paragraph " +"and there is a blank line before the following paragraphs which contain " +"B<Files> and other stanzas. See B<uscan>(1) \"COPYRIGHT FILE EXAMPLE\".)" +msgstr "" + +#. type: textblock +#: ../scripts/mk-origtargz.pl:51 +msgid "" +"The archive type for B<zip> is detected by \"B<file --dereference --brief --" +"mime-type>\" command. So any B<zip> type archives such as B<jar> are " +"treated in the same way. The B<xpi> archive is detected by its extension " +"and is handled properly using the B<xpi-unpack> command." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:47 +#: ../scripts/mk-origtargz.pl:56 msgid "" "If the package name is given via the B<--package> option, no information is " "read from F<debian/>, and the result file is placed in the current directory." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:50 +#: ../scripts/mk-origtargz.pl:59 msgid "" "B<mk-origtargz> is commonly called via B<uscan>, which first obtains the " "upstream tarball." msgstr "" #. type: =head2 -#: ../scripts/mk-origtargz.pl:55 +#: ../scripts/mk-origtargz.pl:64 msgid "Metadata options" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:57 +#: ../scripts/mk-origtargz.pl:66 msgid "" "The following options extend or replace information taken from F<debian/>." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:63 +#: ../scripts/mk-origtargz.pl:72 msgid "" "Use I<package> as the name of the Debian source package, and do not require " "or use a F<debian/> directory. This option can only be used together with B<-" @@ -12607,50 +12817,50 @@ msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:67 +#: ../scripts/mk-origtargz.pl:76 msgid "" "The default is to use the package name of the first entry in " "F<debian/changelog>." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:69 +#: ../scripts/mk-origtargz.pl:78 msgid "B<-v>, B<--version> I<version>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:71 +#: ../scripts/mk-origtargz.pl:80 msgid "" "Use I<version> as the version of the package. This needs to be the upstream " "version portion of a full Debian version, i.e. no Debian revision, no epoch." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:73 +#: ../scripts/mk-origtargz.pl:83 msgid "" "The default is to use the upstream portion of the version of the first entry " "in F<debian/changelog>." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:75 +#: ../scripts/mk-origtargz.pl:86 msgid "B<--exclude-file> I<glob>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:77 +#: ../scripts/mk-origtargz.pl:88 msgid "" "Remove files matching the given I<glob> from the tarball, as if it was " "listed in B<Files-Excluded>." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:80 +#: ../scripts/mk-origtargz.pl:91 msgid "B<--copyright-file> I<filename>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:82 +#: ../scripts/mk-origtargz.pl:93 msgid "" "Remove files matching the patterns found in I<filename>, which should have " "the format of a Debian F<copyright> file (B<Format: " @@ -12660,7 +12870,7 @@ msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:84 +#: ../scripts/mk-origtargz.pl:99 msgid "" "Unmatched patterns will emit a warning so the user can verify whether it is " "correct. If there are multiple patterns which match a file, only the last " @@ -12668,7 +12878,7 @@ msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:88 +#: ../scripts/mk-origtargz.pl:103 msgid "" "Both the B<--exclude-file> and B<--copyright-file> options amend the list of " "patterns found in F<debian/copyright>. If you do not want to read that file, " @@ -12676,125 +12886,147 @@ msgstr "" #. type: =head2 -#: ../scripts/mk-origtargz.pl:94 +#: ../scripts/mk-origtargz.pl:109 msgid "Action options" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:96 +#: ../scripts/mk-origtargz.pl:111 msgid "" "These options specify what exactly B<mk-origtargz> should do. The options B<-" "-copy>, B<--rename> and B<--symlink> are mutually exclusive." msgstr "" -#. type: TP -#: ../scripts/mk-origtargz.pl:101 ../scripts/uscan.1:397 -#, no-wrap +#. type: =item +#: ../scripts/mk-origtargz.pl:116 ../scripts/uscan.pl:1383 msgid "B<--symlink>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:103 +#: ../scripts/mk-origtargz.pl:118 msgid "" "Make the resulting file a symlink to the given original file. (This is the " "default behaviour.)" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:106 +#: ../scripts/mk-origtargz.pl:121 msgid "" -"If the file has to be modified (because it is a B<zip> file, because of B<--" -"repack> or B<Files-Excluded>), this option behaves like B<--copy>." +"If the file has to be modified (because it is a B<zip>, or B<xpi> file, " +"because of B<--repack> or B<Files-Excluded>), this option behaves like B<--" +"copy>." msgstr "" -#. type: TP -#: ../scripts/mk-origtargz.pl:109 ../scripts/uscan.1:402 -#, no-wrap +#. type: =item +#: ../scripts/mk-origtargz.pl:124 ../scripts/uscan.pl:1388 msgid "B<--copy>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:111 +#: ../scripts/mk-origtargz.pl:126 msgid "" "Make the resulting file a copy of the original file (unless it has to be " "modified, of course)." msgstr "" -#. type: TP -#: ../scripts/mk-origtargz.pl:113 ../scripts/uscan.1:405 -#, no-wrap +#. type: =item +#: ../scripts/mk-origtargz.pl:129 ../scripts/uscan.pl:1392 msgid "B<--rename>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:115 +#: ../scripts/mk-origtargz.pl:131 msgid "Rename the original file." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:117 +#: ../scripts/mk-origtargz.pl:133 msgid "" -"If the file has to be modified (because it is a B<zip> file, because of B<--" -"repack> or B<Files-Excluded>), this implies that the original file is " -"deleted afterwards." +"If the file has to be modified (because it is a B<zip>, or B<xpi> file, " +"because of B<--repack> or B<Files-Excluded>), this implies that the original " +"file is deleted afterwards." msgstr "" -#. type: TP -#: ../scripts/mk-origtargz.pl:119 ../scripts/uscan.1:408 -#, no-wrap +#. type: =item +#: ../scripts/mk-origtargz.pl:137 ../scripts/uscan.pl:1396 msgid "B<--repack>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:121 +#: ../scripts/mk-origtargz.pl:139 msgid "" "If the given file is not compressed using the desired format (see B<--" "compression>), recompress it." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:124 +#: ../scripts/mk-origtargz.pl:142 msgid "B<-S>, B<--repack-suffix> I<suffix>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:126 +#: ../scripts/mk-origtargz.pl:144 msgid "" "If the file has to be modified, because of B<Files-Excluded>, append " "I<suffix> to the upstream version." msgstr "" -#. type: TP -#: ../scripts/mk-origtargz.pl:128 ../scripts/uscan.1:414 -#, no-wrap +#. type: =item +#: ../scripts/mk-origtargz.pl:147 +msgid "B<-c>, B<--component> I<componentname>" +msgstr "" + +#. type: textblock +#: ../scripts/mk-origtargz.pl:149 +msgid "" +"Use <componentname> as the component name for the secondary upstream " +"tarball. Set I<componentname> as the component name. This is used only for " +"the secondary upstream tarball of the Debian source package. Then " +"I<packagename_version.orig-componentname.tar.gz> is created." +msgstr "" + +#. type: =item +#: ../scripts/mk-origtargz.pl:154 ../scripts/uscan.pl:1405 msgid "B<--compression> [ B<gzip> | B<bzip2> | B<lzma> | B<xz> ]" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:130 +#: ../scripts/mk-origtargz.pl:156 msgid "" -"If B<--repack> is used, or if the given file is a B<zip> file, ensure that " -"the resulting file is compressed using the given scheme. The default is " -"B<gzip>." +"If B<--repack> is used, or if the given file is a B<zip> or B<xpi> file, " +"ensure that the resulting file is compressed using the given scheme. The " +"default is B<gzip>." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:132 +#: ../scripts/mk-origtargz.pl:160 msgid "B<-C>, B<--directory> I<directory>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:134 +#: ../scripts/mk-origtargz.pl:162 msgid "Put the resulting file in the given directory." msgstr "" +#. type: =item +#: ../scripts/mk-origtargz.pl:164 +msgid "B<--unzipopt> I<options>" +msgstr "" + +#. type: textblock +#: ../scripts/mk-origtargz.pl:166 +msgid "" +"Add the extra options to use with the B<unzip> command such as B<-a>, B<-" +"aa>, and B<-b>." +msgstr "" + #. type: textblock -#: ../scripts/mk-origtargz.pl:150 +#: ../scripts/mk-origtargz.pl:183 msgid "B<uscan>(1), B<uupdate>(1)" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:154 +#: ../scripts/mk-origtargz.pl:187 msgid "" "B<mk-origtargz> and this manpage have been written by Joachim Breitner " "<I<nomeata@debian.org>>." @@ -12928,12 +13160,6 @@ "bug report is submitted directly to the BTS." msgstr "" -#. type: TP -#: ../scripts/nmudiff.1:26 -#, no-wrap -msgid "B<--old>" -msgstr "" - #. type: Plain text #: ../scripts/nmudiff.1:31 msgid "" @@ -13117,6 +13343,11 @@ msgid "Various download locations are tried:" msgstr "" +#. type: =item +#: ../scripts/origtargz.pl:46 ../scripts/origtargz.pl:50 ../scripts/origtargz.pl:54 ../scripts/origtargz.pl:58 ../scripts/origtargz.pl:62 +msgid "*" +msgstr "" + #. type: textblock #: ../scripts/origtargz.pl:48 msgid "First, an existing file is looked for." @@ -14770,7 +15001,7 @@ msgstr "" #. type: =item -#: ../scripts/transition-check.pl:61 ../scripts/who-permits-upload.pl:119 +#: ../scripts/transition-check.pl:61 ../scripts/who-permits-upload.pl:120 msgid "0Z<>" msgstr "" @@ -14782,7 +15013,7 @@ msgstr "" #. type: =item -#: ../scripts/transition-check.pl:66 ../scripts/who-permits-upload.pl:123 +#: ../scripts/transition-check.pl:66 ../scripts/who-permits-upload.pl:124 msgid "1Z<>" msgstr "" @@ -14803,1161 +15034,3163 @@ msgid "Adam D. Barratt <I<adam@adam-barratt.org.uk>>" msgstr "" -#. type: TH -#: ../scripts/uscan.1:1 -#, no-wrap -msgid "USCAN" -msgstr "" - -#. type: Plain text -#: ../scripts/uscan.1:4 +#. type: textblock +#: ../scripts/uscan.pl:29 msgid "uscan - scan/watch upstream sources for new releases of software" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:6 -msgid "B<uscan> [I<options>] [I<path-to-debian-source-packages> ...]" +#. type: textblock +#: ../scripts/uscan.pl:33 +msgid "B<uscan> [I<options>] [I<path>]" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:16 +#. type: textblock +#: ../scripts/uscan.pl:37 msgid "" -"B<uscan> scans the given directories (or the current directory if none are " -"specified) and all of their subdirectories for packages containing a control " -"file I<debian/watch>. Parameters are then read from those control files and " -"upstream ftp or http sites are inspected for newly available updates (as " -"compared with the upstream version number retrieved from the " -"I<debian/changelog> file in the same directory). The newest updates are " -"retrieved (as determined by their version numbers) and if specified in the " -"I<watch> file, a program may then be executed on the newly downloaded source." +"For basic usage, B<uscan> is executed without any arguments from the root of " +"the Debianized source tree where you see the F<debian/> directory. Then " +"typically the following happens:" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:21 +#. type: =item +#: ../scripts/uscan.pl:43 msgid "" -"The traditional I<debian/watch> files can still be used, but the current " -"format offers both simpler and more flexible services. We do not describe " -"the old format here; for their documentation, see the source code for uscan." +"* B<uscan> reads the first entry in F<debian/changelog> to determine the " +"source package name I<< <spkg> >> and the last upstream version." msgstr "" -#. type: SH -#: ../scripts/uscan.1:22 -#, no-wrap -msgid "FORMAT of debian/watch files" +#. type: =item +#: ../scripts/uscan.pl:46 +msgid "" +"* B<uscan> process the watch lines F<debian/watch> from the top to the " +"bottom in a single pass." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:28 +#. type: =item +#: ../scripts/uscan.pl:51 msgid "" -"The following demonstrates the type of entries which can appear in a " -"I<debian/watch> file. Obviously, not all of these would appear in one such " -"file; usually, one would have one line for the current package." +"* B<uscan> downloads a web page from the specified I<URL> in F<debian/watch>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:33 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:54 msgid "" -"# format version number, currently 3; this line is compulsory!\n" -"version=3\n" +"* B<uscan> extracts hrefs pointing to the upstream tarball(s) from the web " +"page using the specified I<matching-pattern> in F<debian/watch>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:35 -#, no-wrap -msgid "# Line continuations are performed with B<\\e>\n" +#. type: =item +#: ../scripts/uscan.pl:57 +msgid "" +"* B<uscan> downloads the upstream tarball with the highest version newer " +"than the last upstream version." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:40 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:60 msgid "" -"# This is the format for an FTP site:\n" -"# Full-site-with-pattern [Version [Action]]\n" -"ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.+)\\e.tar\\e.gz \\e\n" -" debian uupdate\n" +"* B<uscan> saves the downloaded tarball to the parent B<../> directory: I<< " +"../<upkg>-<uversion>.tar.gz >>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:44 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:63 msgid "" -"# This is the format for an FTP site with regex special characters in\n" -"# the filename part\n" -"ftp://ftp.worldforge.org/pub/worldforge/libs/Atlas-C++/transitional/Atlas-C\\" -"e+\\e+-(.+)\\e.tar\\e.gz\n" +"* B<uscan> invokes B<mk-origtargz> to create the source tarball: I<< " +"../<spkg>_<oversion>.orig.tar.gz >>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:47 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:68 msgid "" -"# This is the format for an FTP site with directory pattern matching\n" -"ftp://ftp.nessus.org/pub/nessus/nessus-([\\ed\\e.]+)/src/nessus-core-([\\ed\\" -"e.]+)\\e.tar\\e.gz\n" +"* For a multiple upstream tarball (MUT) package, the secondary upstream " +"tarball will instead be named I<< ../<spkg>_<oversion>.orig-" +"<component>.tar.gz >>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:51 -#, no-wrap -msgid "" -"# This can be used if you want to override the PASV setting\n" -"# for a specific site\n" -"# opts=pasv ftp://.../...\n" +#. type: =item +#: ../scripts/uscan.pl:73 +msgid "* Repeat until all lines in F<debian/watch> are processed." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:57 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:77 msgid "" -"# This is one format for an HTTP site, which is the same\n" -"# as the FTP format. B<uscan> starts by downloading the homepage,\n" -"# obtained by removing the last component of the URL; in this case,\n" -"# I<http://www.cpan.org/modules/by-module/Text/>\n" -"http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-(.+)\\e.tar\\e.gz\n" +"* B<uscan> invokes B<uupdate> to create the Debianized source tree: I<< " +"../<spkg>-<oversion>/* >>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:63 -#, no-wrap -msgid "" -"# This is a variant HTTP format which allows direct specification of\n" -"# the homepage:\n" -"# Homepage Pattern [Version [Action]]\n" -"http://www.dataway.ch/~lukasl/amph/amph.html \\e\n" -" files/amphetamine-([\\ed\\e.]*).tar.bz2\n" +#. type: textblock +#: ../scripts/uscan.pl:82 +msgid "Please note the following." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:70 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:86 msgid "" -"# This one shows that recursive directory scanning works, in either of\n" -"# two forms, as long as the website can handle requests of the form\n" -"# I<http://site/inter/mediate/dir/>\n" -"http://tmrc.mit.edu/mirror/twisted/Twisted/(\\ed\\e.\\ed)/ \\e\n" -" Twisted-([\\ed\\e.]*)\\e.tar\\e.bz2\n" -"http://tmrc.mit.edu/mirror/twisted/Twisted/(\\ed\\e.\\ed)/Twisted-([\\ed\\" -"e.]*)\\e.tar\\e.bz2\n" +"* For simplicity, the compression method used in examples is B<gzip> with " +"B<.gz> suffix. Other methods such as B<xz>, B<bzip2>, and B<lzma> with " +"corresponding B<xz>, B<bz2>, and B<lzma> suffixes may also be used." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:73 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:90 msgid "" -"# For maximum flexibility with upstream tarball formats, use this:\n" -"http://example.com/example-(\\ed[\\ed.]*)\\e.(?:zip|tgz|tbz2|txz|tar\\" -"e.(?:gz|bz2|xz))\n" +"* The new B<version=4> enables handling of multiple upstream tarball (MUT) " +"packages but this is a rare case for Debian packaging. For a single " +"upstream tarball package, there is only one watch line and no I<< " +"../<spkg>_<oversion>.orig-<component>.tar.gz >> ." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:78 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:95 msgid "" -"# qa.debian.org runs a redirector which allows a simpler form of URL\n" -"# for SourceForge based projects. The format below will automatically\n" -"# be rewritten to use the redirector.\n" -"http://sf.net/audacity/audacity-src-(.+)\\e.tar\\e.gz\n" +"* B<uscan> with the B<--verbose> option produces a human readable report of " +"B<uscan>'s execution." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:84 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:98 msgid "" -"# For GitHub projects you can use the tags or releases page. Since the " -"archive\n" -"# URLs use only the version as the name, it is recommended to use a\n" -"# filenamemangle to adjust the name of the downloaded file:\n" -"opts=\"filenamemangle=s/(?:.*?\\/)?v?(\\ed[\\ed.]*)\\e.tar\\" -"e.gz/E<lt>projectE<gt>-$1.tar.gz/\" \\e\n" -" https://github.com/E<lt>userE<gt>/E<lt>projectE<gt>/tags (?:.*?/)?v?(\\" -"ed[\\ed.]*)\\e.tar\\e.gz\n" +"* B<uscan> with the B<--debug> option produces a human readable report of " +"B<uscan>'s execution including internal variable states." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:88 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:101 msgid "" -"# For Google Code projects you should use the downloads page like this:\n" -"https://code.google.com/p/E<lt>projectE<gt>/downloads/list?can=1 \\e\n" -" .*/E<lt>projectE<gt>-(\\ed[\\ed.]*)\\e.tar\\e.gz\n" +"* B<uscan> with the B<--dehs> option produces an upstream package status " +"report in XML format for other programs such as the Debian External Health " +"System." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:93 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:105 msgid "" -"# This is the format for a site which has funny version numbers;\n" -"# the parenthesised groups will be joined with dots to make a\n" -"# sanitised version number\n" -"http://www.site.com/pub/foobar/foobar_v(\\ed+)_(\\ed+)\\e.tar\\e.gz\n" +"* The primary objective of B<uscan> is to help identify if the latest " +"version upstream tarball is used or not; and to download the latest upstream " +"tarball. The ordering of versions is decided by B<dpkg --compare-versions>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:101 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:109 msgid "" -"# This is another way of handling site with funny version numbers,\n" -"# this time using mangling. (Note that multiple groups will be\n" -"# concatenated before mangling is performed, and that mangling will\n" -"# only be performed on the basename version number, not any path\n" -"# version numbers.)\n" -"opts=\"uversionmangle=s/^/0.0./\" \\e\n" -" ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-(.+)\\e.tar\\" -"e.gz\n" +"* B<uscan> with the B<--safe> option limits the functionality of B<uscan> to " +"its primary objective. Both the repacking of downloaded files and updating " +"of the source tree are skipped to avoid running unsafe scripts. This also " +"changes the default to B<--no-download> and B<--skip-signature>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:106 -#, no-wrap -msgid "" -"# Similarly, the upstream part of the Debian version number can be\n" -"# mangled:\n" -"opts=dversionmangle=s/\\e+dfsg\\ed*$// \\e\n" -" http://some.site.org/some/path/foobar-(.+)\\e.tar\\e.gz\n" +#. type: =head1 +#: ../scripts/uscan.pl:116 +msgid "FORMAT OF THE WATCH FILE" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:119 -#, no-wrap +#. type: textblock +#: ../scripts/uscan.pl:118 msgid "" -"# The filename is found by taking the last component of the URL and\n" -"# removing everything after any 'B<?>'. If this would not make a usable\n" -"# filename, use filenamemangle. For example,\n" -"# E<lt>A href=\"http://foo.bar.org/download/?path=&download=foo-" -"0.1.1.tar.gz\"E<gt>\n" -"# could be handled as:\n" -"# opts=filenamemangle=s/.*=(.*)/$1/ \\e\n" -"# http://foo.bar.org/download/\\e?path=&download=foo-(.+)\\e.tar\\e.gz\n" -"#\n" -"# E<lt>A " -"href=\"http://foo.bar.org/download/?path=&download_version=0.1.1\"E<gt>\n" -"# could be handled as:\n" -"# opts=filenamemangle=s/.*=(.*)/foo-$1\\e.tar\\e.gz/ \\e\n" -"# http://foo.bar.org/download/\\e?path=&download_version=(.+)\n" +"The current version 4 format of F<debian/watch> can be summarized as follows:" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:127 -#, no-wrap -msgid "" -"# The option downloadurlmangle can be used to mangle the URL of the file\n" -"# to download. This can only be used with http:// URLs. This may be\n" -"# necessary if the link given on the web page needs to be transformed in\n" -"# some way into one which will work automatically, for example:\n" -"# opts=downloadurlmangle=s/prdownload/download/ \\e\n" -"# http://developer.berlios.de/project/showfiles.php?group_id=2051 \\e\n" -"# http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz\n" +#. type: =item +#: ../scripts/uscan.pl:122 +msgid "* Leading spaces and tabs are dropped." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:133 -msgid "" -"Comment lines may be introduced with a `B<#>' character. Continuation lines " -"may be indicated by terminating a line with a backslash character." +#. type: =item +#: ../scripts/uscan.pl:124 +msgid "* Empty lines are dropped." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:137 -msgid "" -"The first (non-comment) line of the file must begin `version=3'. This " -"allows for future extensions without having to change the name of the file." +#. type: =item +#: ../scripts/uscan.pl:126 +msgid "* A line started by B<#> (hash) is a comment line and dropped." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:142 +#. type: =item +#: ../scripts/uscan.pl:128 msgid "" -"There are two possibilities for the syntax of an HTTP I<watch> file line, " -"and only one for an FTP line. We begin with the common (and simpler) " -"format. We describe the optional opts=... first field below, and ignore it " -"in what follows." +"* A single B<\\> (back slash) at the end of a line is dropped and the next " +"line is concatenated after removing leading spaces and tabs. The " +"concatenated line is parsed as a single line. (The existence or non-" +"existence of the space before the tailing single B<\\> is significant.)" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:159 -msgid "" -"The first field gives the full pattern of URLs being searched for. In the " -"case of an FTP site, the directory listing for the requested directory will " -"be requested and this will be scanned for files matching the basename " -"(everything after the trailing `B</>'). In the case of an HTTP site, the " -"URL obtained by stripping everything after the trailing slash will be " -"downloaded and searched for hrefs (links of the form E<lt>a href=...E<gt>) " -"to either the full URL pattern given, or to the absolute part (everything " -"without the http://host.name/ part), or to the basename (just the part after " -"the final `B</>'). Everything up to the final slash is taken as a verbatim " -"URL, as long as there are no parentheses (`B<(>' and 'B<)>') in this part of " -"the URL: if it does, the directory name will be matched in the same way as " -"the final component of the URL as described below. (Note that regex " -"metacharacters such as `B<+>' are regarded literally unless they are in a " -"path component containing parentheses; see the Atlas-C++ example above. " -"Also, the parentheses must match within each path component.)" +#. type: =item +#: ../scripts/uscan.pl:133 +msgid "* The first non-comment line is:" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:168 -msgid "" -"The pattern (after the final slash) is a Perl regexp (see B<perlre>(1) for " -"details of these). You need to make the pattern so tight that it matches " -"only the upstream software you are interested in and nothing else. Also, " -"the pattern will be anchored at the beginning and at the end, so it must " -"match the full filename. (Note that for HTTP URLs, the href may include the " -"absolute path or full site and path and still be accepted.) The pattern " -"must contain at least one Perl group as explained in the next paragraph." +#. type: =item +#: ../scripts/uscan.pl:137 +msgid "B<version=4>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:179 -msgid "" -"Having got a list of `files' matching the pattern, their version numbers are " -"extracted by treating the part matching the Perl regexp groups, demarcated " -"by `B<(...)>', joining them with `B<.>' as a separator, and using the result " -"as the version number of the file. The version number will then be mangled " -"if required by the uversionmangle option described below. Finally, the file " -"versions are then compared to find the one with the greatest version number, " -"as determined by B<dpkg --compare-versions>. Note that if you need Perl " -"groups which are not to be used in the version number, either use " -"`B<(?:...)>' or use the uversionmangle option to clean up the mess!" +#. type: textblock +#: ../scripts/uscan.pl:141 +msgid "This is required." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:196 +#. type: =item +#: ../scripts/uscan.pl:143 msgid "" -"The current (upstream) version can be specified as the second parameter in " -"the I<watch> file line. If this is I<debian> or absent, then the current " -"Debian version (as determined by I<debian/changelog>) is used to determine " -"the current upstream version. The current upstream version may also be " -"specified by the command-line option B<--upstream-version>, which specifies " -"the upstream version number of the currently installed package (i.e., the " -"Debian version number without epoch and Debian revision). The upstream " -"version number will then be mangled using the dversionmangle option if one " -"is specified, as described below. If the newest version available is newer " -"than the current version, then it is downloaded into the parent directory, " -"unless the B<--report> or B<--report-status> option has been used. Once the " -"file has been downloaded, then a symlink to the file is made from " -"I<E<lt>packageE<gt>_E<lt>versionE<gt>.orig.tar.{gz|bz2|lzma|xz}> as " -"described by the help for the B<--symlink> option." +"* The following non-comment lines (watch lines) specify the rules for the " +"selection of the candidate upstream tarball URLs and are in one of the " +"following three formats:" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:199 +#. type: =item +#: ../scripts/uscan.pl:149 msgid "" -"Finally, if a third parameter (an action) is given in the I<watch> file " -"line, this is taken as the name of a command, and the command" +"* B<opts=\"> I<...> B<\"> B<http://>I<URL> I<matching-pattern> [I<version> " +"[I<script>]]" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:201 -#, no-wrap -msgid " I<command >B<--upstream-version>I< version filename>\n" +#. type: =item +#: ../scripts/uscan.pl:151 +msgid "* B<http://>I<URL> I<matching-pattern> [I<version> [I<script>]]" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:210 -msgid "" -"is executed, using either the original file or the symlink name. A common " -"such command would be B<uupdate>(1). (Note that the calling syntax was " -"slightly different when using I<watch> file without a `B<version=>...' line; " -"there the command executed was `I<command filename version>'.) If the " -"command is B<uupdate>, then the B<--no-symlink> option is given to " -"B<uupdate> as a first option, since any requested symlinking will already be " -"done by B<uscan>." +#. type: =item +#: ../scripts/uscan.pl:153 +msgid "* B<opts=\"> I<...> B<\">" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:226 -msgid "" -"The alternative version of the I<watch> file syntax for HTTP URLs is as " -"follows. The first field is a homepage which should be downloaded and then " -"searched for hrefs matching the pattern given in the second field. (Again, " -"this pattern will be anchored at the beginning and the end, so it must match " -"the whole href. If you want to match just the basename of the href, you can " -"use a pattern like \".*/name-(.+)\\e.tar\\e.gz\" if you know that there is a " -"full URL, or better still: \"(?:.*/)?name-(.+)\\e.tar\\e.gz\" if there may " -"or may not be. Note the use of (?:...) to avoid making a backreference.) " -"If any of the hrefs in the homepage which match the (anchored) pattern are " -"relative URLs, they will be taken as being relative to the base URL of the " -"homepage (i.e., with everything after the trailing slash removed), or " -"relative to the base URL specified in the homepage itself with a E<lt>base " -"href=\"...\"E<gt> tag. The third and fourth fields are the version number " -"and action fields as before." +#. type: textblock +#: ../scripts/uscan.pl:157 +msgid "Here," msgstr "" -#. type: SH -#: ../scripts/uscan.1:226 -#, no-wrap -msgid "PER-SITE OPTIONS" +#. type: =item +#: ../scripts/uscan.pl:161 +msgid "" +"* B<opts=\"> I<...> B<\"> specifies the behavior of B<uscan>. See L<WATCH " +"FILE OPTIONS>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:232 +#. type: =item +#: ../scripts/uscan.pl:164 msgid "" -"A I<watch> file line may be prefixed with `B<opts=>I<options>', where " -"I<options> is a comma-separated list of options. The whole I<options> " -"string may be enclosed in double quotes, which is necessary if I<options> " -"contains any spaces. The recognised options are as follows:" +"* B<http://>I<URL> specifies the web page where upstream publishes the link " +"to the latest source archive." msgstr "" -#. type: TP -#: ../scripts/uscan.1:232 -#, no-wrap -msgid "B<active> and B<passive> (or B<pasv>)" +#. type: =item +#: ../scripts/uscan.pl:169 +msgid "* B<https://>I<URL> may also be used, as may" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:237 -msgid "" -"If used on an FTP line, these override the choice of whether to use PASV " -"mode or not, and force the use of the specified mode for this site." +#. type: =item +#: ../scripts/uscan.pl:171 +msgid "* B<ftp://>I<URL>" msgstr "" -#. type: TP -#: ../scripts/uscan.1:237 -#, no-wrap -msgid "B<uversionmangle=>I<rules>" +#. type: =item +#: ../scripts/uscan.pl:173 +msgid "" +"* Some parts of I<URL> may be in the regex match pattern surrounded between " +"B<(> and B<)> such as B</foo/bar-([\\.\\d]+)/>. (If multiple directories " +"match, the highest version is picked.) Otherwise, the I<URL> is taken as " +"verbatim." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:244 +#. type: =item +#: ../scripts/uscan.pl:180 msgid "" -"This is used to mangle the upstream version number as matched by the " -"ftp://... or http:// rules as follows. First, the I<rules> string is split " -"into multiple rules at every `B<;>'. Then the upstream version number is " -"mangled by applying I<rule> to the version, in a similar way to executing " -"the Perl command:" +"* I<matching-pattern> specifies the full string matching pattern for hrefs " +"in the web page. See L<WATCH FILE EXAMPLES>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:246 -#, no-wrap -msgid " $version =~ I<rule>;\n" +#. type: =item +#: ../scripts/uscan.pl:185 +msgid "" +"* All matching parts in B<(> and B<)> are concatenated with B<.> (period) " +"to form the upstream version." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:251 +#. type: =item +#: ../scripts/uscan.pl:188 msgid "" -"for each rule. Thus, suitable rules might be `B<s/^/0./>' to prepend " -"`B<0.>' to the version number and `B<s/_/./g>' to change underscores into " -"periods. Note that the I<rule> string may not contain commas; this should " -"not be a problem." +"* If the hrefs do not contain directories, you can combine this with the " +"previous entry. I.e., B<http://>I<URL>B</>I<matching-pattern> ." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:256 +#. type: =item +#: ../scripts/uscan.pl:193 msgid "" -"I<rule> may only use the 'B<s>', 'B<tr>' and 'B<y>' operations. When the " -"'B<s>' operation is used, only the 'B<g>', 'B<i>' and 'B<x>' flags are " -"available and I<rule> may not contain any expressions which have the " -"potential to execute code (i.e. the (?{}) and (??{}) constructs are not " -"supported)." +"* I<version> restricts the upstream tarball which may be downloaded. The " +"newest available version is chosen in each case." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:261 +#. type: =item +#: ../scripts/uscan.pl:198 msgid "" -"If the 'B<s>' operation is used, the replacement can contain backreferences " -"to expressions within parenthesis in the matching regexp, like `B<s/-alpha(\\" -"ed*)/.a$1/>'. These backreferences must use the `B<$1>' syntax, as the `B<\\" -"e1>' syntax is not supported." +"* B<debian> requires the downloading upstream tarball to be newer than the " +"version obtained from F<debian/changelog>." msgstr "" -#. type: TP -#: ../scripts/uscan.1:261 -#, no-wrap -msgid "B<dversionmangle=>I<rules>" +#. type: =item +#: ../scripts/uscan.pl:201 +msgid "" +"* I<version-number> such as B<12.5> requires the upstream tarball to be " +"newer than the I<version-number>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:269 +#. type: =item +#: ../scripts/uscan.pl:204 msgid "" -"This is used to mangle the Debian version number of the currently installed " -"package in the same way as the B<uversionmangle> option. Thus, a suitable " -"rule might be `B<s/\\e+dfsg\\ed*$//>' to remove a `B<+dfsg1>' suffix from " -"the Debian version number, or to handle `B<.pre6>' type version numbers. " -"Again, the I<rules> string may not contain commas; this should not be a " -"problem." +"* B<same> requires the downloaded version of the secondary tarballs to be " +"exactly the same as the one for the first upstream tarball downloaded. " +"(Useful only for MUT)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:269 -#, no-wrap -msgid "B<versionmangle=>I<rules>" +#. type: =item +#: ../scripts/uscan.pl:208 +msgid "" +"* B<previous> restricts the version of the signature file. (Used with " +"pgpmode=previous)" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:274 +#. type: =item +#: ../scripts/uscan.pl:211 +msgid "" +"* B<ignore> does not restrict the version of the secondary tarballs. (Maybe " +"useful for MUT)" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:216 +msgid "" +"* I<script> is executed at the end of B<uscan> execution with appropriate " +"arguments provided by B<uscan>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:221 +msgid "" +"* The typical Debian package is a non-native package made from one upstream " +"tarball. Only a single line of the watch line in one of the first two " +"formats is usually used with its I<version> set to B<debian> and I<script> " +"set to B<uupdate>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:226 +msgid "* A native package should not specify I<script>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:228 +msgid "" +"* A multiple upstream tarball (MUT) package should specify B<uupdate> as " +"I<script> in the last watch line and should skip specifying I<script> in the " +"rest of the watch lines." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:234 +msgid "" +"* The last format of the watch line is useful to set the persistent " +"parameters: B<user-agent>, B<compression>. If this format is used, this " +"must be followed by the I<URL> defining watch line(s)." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:238 +msgid "" +"* [ and ] in the above format are there to mark the optional parts and " +"should not be typed." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:245 +msgid "" +"There are a few special strings which are substituted by B<uscan> to make it " +"easy to write the watch file." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:250 +msgid "B<@PACKAGE@>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:252 +msgid "" +"This is substituted with the source package name found in the first line of " +"the F<debian/changelog> file." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:255 +msgid "B<@ANY_VERSION@>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:257 +msgid "This is substituted by the legal upstream version regex (capturing)." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:259 +#, no-wrap +msgid "" +" [-_](\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +"\n" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:261 +msgid "B<@ARCHIVE_EXT@>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:263 +msgid "" +"This is substituted by the typical archive file extension regex (non-" +"capturing)." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:265 +#, no-wrap +msgid "" +" (?i)\\.(?:tar\\.xz|tar\\.bz2|tar\\.gz|zip)\n" +"\n" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:267 +msgid "B<@SIGNATURE_EXT@>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:269 +msgid "" +"This is substituted by the typical signature file extension regex (non-" +"capturing)." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:271 +#, no-wrap +msgid "" +" (?i)\\.(?:tar\\.xz|tar\\.bz2|tar\\.gz|zip)\\.(?:asc|pgp|gpg|sig)\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:275 +msgid "" +"Some file extensions are not included in the above intentionally to avoid " +"false positives. You can still set such file extension patterns manually." +msgstr "" + +#. type: =head1 +#: ../scripts/uscan.pl:278 +msgid "WATCH FILE OPTIONS" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:280 +msgid "" +"B<uscan> reads the watch options specified in B<opts=\"> I<...> B<\"> to " +"customize its behavior. Multiple options I<option1>, I<option2>, I<option3>, " +"... can be set as B<opts=\">I<option1>B<,> I<option2>B<,> I<option3>B<,> I< " +"... >B<\"> . The double quotes are necessary if options contain any spaces." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:285 +msgid "" +"Unless otherwise noted as persistent, most options are valid only within " +"their containing watch line." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:288 +msgid "The available watch options are:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:292 +msgid "B<component=>I<component>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:294 +msgid "" +"Set the name of the secondary source tarball as I<< <spkg>_<oversion>.orig-" +"<component>.tar.gz >> for a MUT package." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:297 +msgid "B<compression=>I<method>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:299 +msgid "" +"Set the compression I<method> when the tarball is repacked (persistent)." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:301 +msgid "" +"Available I<method> values are B<xz>, B<gzip> (alias B<gz>), B<bzip2> (alias " +"B<bz2>), and B<lzma>. The default is B<gzip> for normal tarballs, and B<xz> " +"for tarballs generated directly from a git repository." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:305 +msgid "" +"If the debian source format is not 1.0, setting this to B<xz> should help " +"reduce the package size when the package is repacked." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:308 +msgid "" +"Please note the repacking of the upstream tarballs by B<mk-origtargz> " +"happens only if one of the following conditions is satisfied:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:313 +msgid "" +"* B<USCAN_REPACK> is set in the devscript configuration. See L<DEVSCRIPT " +"CONFIGURATION VARIABLES>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:316 +msgid "* B<--repack> is set on the commandline. See <COMMANDLINE OPTIONS>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:318 +msgid "* B<repack> is set in the watch line as B<opts=\"repack,>I<...>B<\">." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:320 +msgid "" +"* The upstream archive is of B<zip> type including B<jar>, B<xpi>, ..." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:322 +msgid "" +"* B<Files-Excluded> or B<Files-Excluded->I<component> stanzas are set in " +"F<debian/copyright> to make B<mk-origtargz> invoked from B<uscan> remove " +"files from the upstream tarball and repack it. See L<COPYRIGHT FILE " +"EXAMPLES> and mk-origtargz(1)." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:329 +msgid "B<repack>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:331 +msgid "" +"Force repacking of the upstream tarball using the compression I<method>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:333 +msgid "B<repacksuffix=>I<suffix>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:335 +msgid "" +"Add I<suffix> to the Debian package upstream version only when the source " +"tarball is repackaged. This rule should be used only for a single upstream " +"tarball package." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:339 +msgid "B<mode=>I<mode>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:341 +msgid "Set the archive download I<mode>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:345 +msgid "B<LWP>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:347 +msgid "" +"This mode is the default one which downloads the specified tarball from the " +"archive URL on the web." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:352 +msgid "" +"This mode accesses the upstream git archive directly with the B<git> command " +"and packs the source tree with the specified tag into I<spkg-" +"version>B<.tar.xz>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:356 +msgid "" +"If the upstream publishes the released tarball via its web interface, please " +"use it instead of using this mode. This mode is the last resort method." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:361 +msgid "B<pgpmode=>I<mode>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:363 +msgid "Set the PGP/GPG signature verification I<mode>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:367 +msgid "B<auto>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:369 +msgid "" +"B<uscan> checks possible URLs for the signature file and autogenerates a " +"B<pgpsigurlmangle> rule to use it." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:372 +msgid "B<default>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:374 +msgid "" +"Use B<pgpsigurlmangle=>I<rules> to generate the candidate upstream signature " +"file URL string from the upstream tarball URL. (default)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:377 +msgid "" +"If the specified B<pgpsigurlmangle> is missing, B<uscan> checks possible " +"URLs for the signature file and suggests adding a B<pgpsigurlmangle> rule." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:380 +msgid "B<mangle>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:382 +msgid "" +"Use B<pgpsigurlmangle=>I<rules> to generate the candidate upstream signature " +"file URL string from the upstream tarball URL." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:385 +msgid "B<next>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:387 +msgid "" +"Verify this downloaded tarball file with the signature file specified in the " +"next watch line. The next watch line must be B<pgpmode=previous>. " +"Otherwise, no verification occurs." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:391 +msgid "B<previous>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:393 +msgid "" +"Verify the downloaded tarball file specified in the previous watch line with " +"this signature file. The previous watch line must be B<pgpmode=next>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:396 +msgid "B<self>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:398 +msgid "" +"Verify the downloaded file I<foo.ext> with its self signature and extract " +"its content tarball file as I<foo>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:401 +msgid "B<none>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:403 +msgid "No signature available. (No warning.)" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:407 +msgid "B<decompress>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:409 +msgid "" +"Decompress compressed archive before the pgp/gpg signature verification." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:411 +msgid "B<bare>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:413 +msgid "" +"Disable all site specific special case code such as URL redirector uses and " +"page content alterations. (persistent)" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:416 +msgid "B<user-agent=>I<user-agent-string>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:418 +msgid "" +"Set the user-agent string used to contact the HTTP(S) server as I<user-agent-" +"string>. (persistent)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:421 +msgid "" +"B<user-agent> option should be specified by itself in the watch line without " +"I<URL>, to allow using semicolons and commas in it." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:424 +msgid "B<pasv>, B<passsive>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:426 +msgid "Use PASV mode for the FTP connection." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:428 +msgid "" +"If PASV mode is required due to the client side network environment, set " +"B<uscan> to use PASV mode via L<COMMANDLINE OPTIONS> or L<DEVSCRIPT " +"CONFIGURATION VARIABLES> instead." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:432 +msgid "B<active>, B<nopasv>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:434 +msgid "Don't use PASV mode for the FTP connection." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:436 +msgid "B<unzipopt=>I<options>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:438 +msgid "" +"Add the extra options to use with the B<unzip> command, such as B<-a>, B<-" +"aa>, and B<-b>, when executed by B<mk-origtargz>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:441 +msgid "B<dversionmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:443 +msgid "" +"Normalize the last upstream version string found in F<debian/changelog> to " +"compare it to the available upstream tarball version. Removal of the Debian " +"specific suffix such as B<s/\\+dfsg\\d*$//> is usually done here." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:447 +msgid "B<dirversionmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:449 +msgid "" +"Normalize the directory path string matching the regex in a set of " +"parentheses of B<http://>I<URL> as the sortable version index string. This " +"is used as the directory path sorting index only." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:453 ../scripts/uscan.pl:469 +msgid "Substitution such as B<s/PRE/~pre/; s/RC/~rc/> may help." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:455 +msgid "B<pagemangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:457 +msgid "" +"Normalize the downloaded web page string. (Don't use this unless this is " +"absolutely needed. Generally, B<g> flag is required for these I<rules>.)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:460 +msgid "" +"This is handy if you wish to access Amazon AWS or Subversion repositories in " +"which <a href=\"...\"> is not used." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:463 +msgid "B<uversionmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:465 +msgid "" +"Normalize the candidate upstream version strings extracted from hrefs in the " +"source of the web page. This is used as the version sorting index when " +"selecting the latest upstream version." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:471 +msgid "B<versionmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:473 +msgid "" +"Syntactic shorthand for B<uversionmangle=>I<rules>B<, " +"dversionmangle=>I<rules>" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:475 +msgid "B<downloadurlmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:477 +msgid "" +"Convert the selected upstream tarball href string into the accessible URL " +"for obfuscated web sites." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:480 +msgid "B<filenamemangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:482 +msgid "" +"Generate the upstream tarball filename from the selected href string if " +"I<matching-pattern> can extract the latest upstream version I<< <uversion> " +">> from the selected href string. Otherwise, generate the upstream tarball " +"filename from its full URL string and set the missing I<< <uversion> >> from " +"the generated upstream tarball filename." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:488 +msgid "" +"Without this option, the default upstream tarball filename is generated by " +"taking the last component of the URL and removing everything after any '?' " +"or '#'." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:492 +msgid "B<pgpsigurlmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:494 +msgid "" +"Generate the candidate upstream signature file URL string from the upstream " +"tarball URL." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:497 +msgid "B<oversionmangle=>I<rules>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:499 +msgid "" +"Generate the version string I<< <oversion> >> of the source tarball I<< " +"<spkg>_<oversion>.orig.tar.gz >> from I<< <uversion> >>. This should be " +"used to add a suffix such as B<+dfsg1> to a MUT package." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:505 +msgid "" +"Here, the mangling rules apply the I<rules> to the pertinent string. " +"Multiple rules can be specified in a mangling rule string by making a " +"concatenated string of each mangling I<rule> separated by B<;> (semicolon)." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:509 +msgid "" +"Each mangling I<rule> cannot contain B<;> (semicolon), B<,> (comma), or " +"B<\"> (double quote)." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:512 +msgid "" +"Each mangling I<rule> behaves as if a Perl command \"I<$string> B<=~> " +"I<rule>\" is executed. There are some notable details." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:517 +msgid "* I<rule> may only use the B<s>, B<tr>, and B<y> operations." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:521 +msgid "B<s/>I<regex>B</>I<replacement>B</>I<options>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:523 +msgid "" +"Regex pattern match and replace the target string. Only the B<g>, B<i> and " +"B<x> flags are available. Use the B<$1> syntax for back references (No B<\\" +"1> syntax). Code execution is not allowed (i.e. no B<(?{})> or B<(??{})> " +"constructs)." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:528 +msgid "B<y/>I<source>B</>I<dest>B</> or B<tr/>I<source>B</>I<dest>B</>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:530 +msgid "Transliterate the characters in the target string." +msgstr "" + +#. type: =head1 +#: ../scripts/uscan.pl:536 +msgid "EXAMPLE OF EXECUTION" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:538 +msgid "" +"B<uscan> reads the first entry in F<debian/changelog> to determine the " +"source package name and the last upstream version." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:541 +msgid "For example, if the first entry of F<debian/changelog> is:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:545 +msgid "* I<< bar >> (B<3:2.03+dfsg1-4>) unstable; urgency=low" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:549 +msgid "" +"then, the source package name is I<< bar >> and the last Debian package " +"version is B<3:2.03+dfsg1-4>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:552 +msgid "" +"The last upstream version is normalized to B<2.03+dfsg1> by removing the " +"epoch and the Debian revision." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:555 +msgid "" +"If the B<dversionmangle> rule exists, the last upstream version is further " +"normalized by applying this rule to it. For example, if the last upstream " +"version is B<2.03+dfsg1> indicating the source tarball is repackaged, the " +"suffix B<+dfsg1> is removed by the string substitution B<s/\\+dfsg\\d*$//> " +"to make the (dversionmangled) last upstream version B<2.03> and it is " +"compared to the candidate upstream tarball versions such as B<2.03>, " +"B<2.04>, ... found in the remote site. Thus, set this rule as:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:565 +msgid "* B<opts=\"dversionmangle=s/\\+dfsg\\d*$//\">" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:569 +msgid "" +"B<uscan> downloads a web page from B<http://>I<URL> specified in " +"F<debian/watch>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:574 +msgid "" +"* If the directory name part of I<URL> has no parentheses, B<(> and B<)>, it " +"is taken as verbatim." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:577 +msgid "" +"* If the directory name part of I<URL> has parentheses, B<(> and B<)>, then " +"B<uscan> recursively searches all possible directories to find a page for " +"the newest version. If the B<dirversionmangle> rule exists, the generated " +"sorting index is used to find the newest version. If a specific version is " +"specified for the download, the matching version string has priority over " +"the newest version." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:586 +msgid "For example, this B<http://>I<URL> may be specified as:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:590 +msgid "* B<http://www.example.org/([\\d\\.]+)/>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:594 +msgid "" +"Please note the trailing B</> in the above to make B<([\\d\\.]+)> as the " +"directory." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:597 +msgid "" +"If the B<pagemangle> rule exists, the whole downloaded web page as a string " +"is normalized by applying this rule to it. This is very powerful tool and " +"needs to be used with caution. If other mangling rules can be used to " +"address your objective, do not use this rule." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:602 +msgid "" +"The downloaded web page is scanned for hrefs defined in the B<< <a href=\" " +">> I<...> B<< \"> >> tag to locate the candidate upstream tarball hrefs. " +"These candidate upstream tarball hrefs are matched by the Perl regex pattern " +"I<matching-pattern> such as B<< DL-(?:[\\d\\.]+?)/foo-(.+)\\.tar\\.gz >> to " +"narrow down the candidates. This pattern match needs to be anchored at the " +"beginning and the end. For example, candidate hrefs may be:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:611 +msgid "* B<< DL-2.02/foo-2.02.tar.gz >>" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:613 +msgid "* B<< DL-2.03/foo-2.03.tar.gz >>" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:615 +msgid "* B<< DL-2.04/foo-2.04.tar.gz >>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:619 +msgid "" +"Here the matching string of B<(.+)> in I<matching-pattern> is considered as " +"the candidate upstream version. If there are multiple matching strings of " +"capturing patterns in I<matching-pattern>, they are all concatenated with " +"B<.> (period) to form the candidate upstream version. Make sure to use the " +"non-capturing regex such as B<(?:[\\d\\.]+?)> instead for the variable text " +"matching part unrelated to the version." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:626 +msgid "Then, the candidate upstream versions are:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:630 +msgid "* B<2.02>" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:632 +msgid "* B<2.03>" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:634 +msgid "* B<2.04>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:638 +msgid "" +"The downloaded tarball filename is basically set to the same as the filename " +"in the remote URL of the selected href." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:641 +msgid "" +"If the B<uversionmangle> rule exists, the candidate upstream versions are " +"normalized by applying this rule to them. (This rule may be useful if the " +"upstream version scheme doesn't sort correctly to identify the newest " +"version.)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:645 +msgid "" +"The upstream tarball href corresponding to the newest (uversionmangled) " +"candidate upstream version newer than the (dversionmangled) last upstream " +"version is selected." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:649 +msgid "" +"If multiple upstream tarball hrefs corresponding to a single verion with " +"different extensions exist, the highest compression one is chosen. " +"(Priority: B<< tar.xz > tar.lzma > tar.bz2 > tar.gz >>.)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:653 +msgid "" +"If the selected upstream tarball href is the relative URL, it is converted " +"to the absolute URL using the base URL of the web page. If the B<< <base " +"href=\" >> I< ... > B<< \"> >> tag exists in the web page, the selected " +"upstream tarball href is converted to the absolute URL using the specified " +"base URL in the base tag, instead." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:659 +msgid "" +"If the B<downloadurlmangle> rule exists, the selected upstream tarball href " +"is normalized by applying this rule to it. (This is useful for some sites " +"with the obfuscated download URL.)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:663 +msgid "" +"If the B<filenamemangle> rule exists, the downloaded tarball filename is " +"generated by applying this rule to the selected href if I<matching-pattern> " +"can extract the latest upstream version I<< <uversion> >> from the selected " +"href string. Otherwise, generate the upstream tarball filename from its full " +"URL string and set the missing I<< <uversion> >> from the generated upstream " +"tarball filename." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:670 +msgid "" +"Without the B<filenamemangle> rule, the default upstream tarball filename is " +"generated by taking the last component of the URL and removing everything " +"after any '?' or '#'." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:674 +msgid "" +"B<uscan> downloads the selected upstream tarball to the parent B<../> " +"directory. For example, the downloaded file may be:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:679 +msgid "* F<../foo-2.04.tar.gz>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:683 +msgid "" +"Let's call this downloaded version B<2.04> in the above example generically " +"as I<< <uversion> >> in the following." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:686 +msgid "" +"If the B<pgpsigurlmangle> rule exists, the upstream signature file URL is " +"generated by applying this rule to the (downloadurlmangled) selected " +"upstream tarball href and the signature file is tried to be downloaded from " +"it." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:690 +msgid "" +"If the B<pgpsigurlmangle> rule doesn't exist, B<uscan> warns user if the " +"matching upstream signature file is available from the same URL with their " +"filename being suffixed by the 4 common suffix B<asc>, B<gpg>, B<pgp>, and " +"B<sig>. (You can avoid this warning by setting B<pgpmode=none>.)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:695 +msgid "" +"If the signature file is downloaded, the downloaded upstream tarball is " +"checked for its authenticity against the downloaded signature file using the " +"keyring F<debian/upstream/signing-key.pgp> or the armored keyring " +"F<debian/upstream/signing-key.asc> (see L<KEYRING FILE EXAMPLES>). If its " +"signature is not valid, or not made by one of the listed keys, B<uscan> will " +"report an error." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:702 +msgid "" +"If the B<oversionmangle> rule exists, the source tarball version I<oversion> " +"is generated from the downloaded upstream version I<uversion> by applying " +"this rule. This rule is useful to add suffix such as B<+dfsg1> to the " +"version of all the source packages of the MUT package for which the " +"repacksuffix mechanism doesn't work." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:708 +msgid "" +"B<uscan> invokes B<mk-origtargz> to create the source tarball properly named " +"for the source package with B<.orig.> (or B<< .orig-<component>. >> for the " +"secondary tarballs) in its filename." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:714 +msgid "case A: packaging of the upstream tarball as is" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:716 +msgid "" +"B<mk-origtargz> creates a symlink I<< ../bar_<oversion>.orig.tar.gz >> " +"linked to the downloaded local upstream tarball. Here, I<< bar >> is the " +"source package name found in F<debian/changelog>. The generated symlink may " +"be:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:722 +msgid "* F<../bar_2.04.orig.tar.gz> -> F<foo-2.04.tar.gz> (as is)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:726 +msgid "" +"Usually, there is no need to set up B<opts=\"dversionmangle=> I<...> B<\"> " +"for this case." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:729 +msgid "" +"case B: packaging of the upstream tarball after removing non-DFSG files" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:731 +msgid "" +"B<mk-origtargz> checks the filename glob of the B<Files-Excluded> stanza in " +"the first section of F<debian/copyright>, removes matching files to create a " +"repacked upstream tarball. Normally, the repacked upstream tarball is " +"renamed with I<suffix> to I<< ../bar_<oversion><suffix>.orig.tar.gz >> using " +"the B<repacksuffix> option for the single upstream package. Here I<< " +"<oversion> >> is updated to be I<< <oversion><suffix> >>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:738 +msgid "" +"The removal of files is required if files are not DFSG-compliant. For such " +"case, B<+dfsg1> is used as I<suffix>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:741 +msgid "" +"So the combined options are set as B<opts=\"dversionmangle=s/\\+dfsg\\d*$// " +",repacksuffix=+dfsg1\">, instead." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:744 +msgid "For example, the repacked upstream tarball may be:" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:748 +msgid "* F<../bar_2.04+dfsg1.orig.tar.gz> (repackaged)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:754 +msgid "" +"B<uscan> normally invokes \"B<uupdate> B<--find --upstream-version> " +"I<oversion> \" for the version=4 watch file." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:757 +msgid "" +"Please note that B<--find> option is used here since B<mk-origtargz> has " +"been invoked to make B<*.orig.tar.gz> file already. B<uscan> picks I<< bar " +">> from F<debian/changelog>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:761 +msgid "" +"It creates the new upstream source tree under the I<< ../bar-<oversion> >> " +"directory and Debianize it leveraging the last package contents." +msgstr "" + +#. type: =head1 +#: ../scripts/uscan.pl:764 +msgid "WATCH FILE EXAMPLES" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:766 +msgid "" +"When writing the watch file, you should rely on the latest upstream source " +"announcement web page. You should not try to second guess the upstream " +"archive structure if possible. Here are the typical F<debian/watch> files." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:770 +msgid "" +"Please note that executing B<uscan> with B<-v> or B<-vv> reveals what " +"exactly happens internally." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:773 +msgid "" +"The existence and non-existence of a space the before tailing B<\\> (back " +"slash) are significant." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:776 +msgid "HTTP site (basic)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:778 +msgid "Here is an example for the basic single upstream tarball." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:780 +#, no-wrap +msgid "" +" version=4\n" +" http://example.com/~user/release/foo.html \\\n" +" files/foo-([\\d\\.]+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:784 +msgid "Or using the special strings:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:786 +#, no-wrap +msgid "" +" version=4\n" +" http://example.com/~user/release/@PACKAGE@.html \\\n" +" files/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:790 +msgid "" +"For the upstream source package B<foo-2.0.tar.gz>, this watch file downloads " +"and creates the Debian B<orig.tar> file B<foo_2.0.orig.tar.gz>." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:793 +msgid "HTTP site (pgpsigurlmangle)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:795 +msgid "" +"Here is an example for the basic single upstream tarball with the matching " +"signature file in the same file path." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:798 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpsigurlmangle=s%$%.asc%\" " +"http://example.com/release/@PACKAGE@.html \\\n" +" files/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:802 +msgid "" +"For the upstream source package B<foo-2.0.tar.gz> and the upstream signature " +"file B<foo-2.0.tar.gz.asc>, this watch file downloads these files, verifies " +"the authenticity using the keyring F<debian/upstream-key.pgp> and creates " +"the Debian B<orig.tar> file B<foo_2.0.orig.tar.gz>." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:807 +msgid "HTTP site (pgpmode=next/previous)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:809 +msgid "" +"Here is an example for the basic single upstream tarball with the matching " +"signature file in the unrelated file path." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:812 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpmode=next\" http://example.com/release/@PACKAGE@.html \\\n" +" files/(?:\\d+)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian\n" +" opts=\"pgpmode=previous\" http://example.com/release/@PACKAGE@.html \\\n" +" files/(?:\\d+)/@PACKAGE@@ANY_VERSION@@SIGNATURE_EXT@ previous uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:818 +msgid "" +"B<(?:\\d+)> part can be any random value. The tarball file can have B<53>, " +"while the signature file can have B<33>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:821 +msgid "" +"B<([\\d\\.]+)> part for the signature file has a strict requirement to match " +"that for the upstream tarball specified in the previous line by having " +"B<previous> as I<version> in the watch line." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:825 +msgid "HTTP site (flexible)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:827 +msgid "" +"Here is an example for the maximum flexibility of upstream tarball and " +"signature file extensions." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:830 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpmode=next\" http://example.com/DL/ \\\n" +" files/(?:\\d+)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian\n" +" opts=\"pgpmode=prevous\" http://example.com/DL/ \\\n" +" files/(?:\\d+)/@PACKAGE@@ANY_VERSION@@SIGNATURE_EXT@ \\\n" +" previous uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:837 +msgid "HTTP site (basic MUT)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:839 +msgid "Here is an example for the basic multiple upstream tarballs." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:841 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpsigurlmangle=s%$%.sig%\" \\\n" +" http://example.com/release/foo.html \\\n" +" files/foo-([\\d\\.]+)\\.tar\\.gz debian\n" +" opts=\"pgpsigurlmangle=s%$%.sig%, component=bar\" \\\n" +" http://example.com/release/foo.html \\\n" +" files/foobar-([\\d\\.]+)\\.tar\\.gz same\n" +" opts=\"pgpsigurlmangle=s%$%.sig%, component=baz\" \\\n" +" http://example.com/release/foo.html \\\n" +" files/foobaz-([\\d\\.]+)\\.tar\\.gz same uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:852 +msgid "" +"For the main upstream source package B<foo-2.0.tar.gz> and the secondary " +"upstream source packages B<foobar-2.0.tar.gz> and B<foobaz-2.0.tar.gz> which " +"install under F<bar/> and F<baz/>, this watch file downloads and creates the " +"Debian B<orig.tar> file B<foo_2.0.orig.tar.gz>, B<foo_2.0.orig-bar.tar.gz> " +"and B<foo_2.0.orig-baz.tar.gz>. Also, these upstream tarballs are verified " +"by their signature files." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:859 +msgid "HTTP site (recursive directory scanning)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:861 +msgid "" +"Here is an example with the recursive directory scanning for the upstream " +"tarball and its signature files released in a directory named after their " +"version." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:865 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpsigurlmangle=s%$%.sig%, dirversionmangle=s/-PRE/~pre/;s/-" +"RC/~rc/\" \\\n" +" http://tmrc.mit.edu/mirror/twisted/Twisted/([\\d+\\.]+)/ \\\n" +" Twisted-([\\d\\.]+)\\.tar\\.xz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:870 +msgid "Here, the web site should be accessible at the following URL:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:872 +#, no-wrap +msgid "" +" http://tmrc.mit.edu/mirror/twisted/Twisted/\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:874 +msgid "" +"Here, B<dirversionmangle> option is used to normalize the sorting order of " +"the directory names." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:877 +msgid "HTTP site (alternative shorthand)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:879 +msgid "" +"For the bare HTTP site where you can directly see archive filenames, the " +"normal watch file:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:882 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpsigurlmangle=s%$%.sig%\" \\\n" +" http://www.cpan.org/modules/by-module/Text/ \\\n" +" Text-CSV_XS-(.+)\\.tar\\.gz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:888 +msgid "can be rewritten in an alternative shorthand form:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:890 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpsigurlmangle=s%$%.sig%\" \\\n" +" http://www.cpan.org/modules/by-module/Text/\\\n" +" Text-CSV_XS-(.+)\\.tar\\.gz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:896 +msgid "" +"Please note that I<matching-pattern> of the first example doesn't have " +"directory and the subtle difference of a space before the tailing B<\\>." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:899 +msgid "HTTP site (funny version)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:901 +msgid "" +"For a site which has funny version numbers, the parenthesized groups will be " +"joined with B<.> (period) to make a sanitized version number." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:904 +#, no-wrap +msgid "" +" version=4\n" +" http://www.site.com/pub/foobar/foobar_v(\\d+)_(\\d+)\\.tar\\.gz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:908 +msgid "HTTP site (DFSG)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:910 +msgid "" +"The upstream part of the Debian version number can be mangled to indicate " +"the source package was repackaged to clean up non-DFSG files:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:913 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"dversionmangle=s/\\+dfsg\\d*$//,repacksuffix=+dfsg1\" \\\n" +" http://some.site.org/some/path/foobar-(.+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:917 ../scripts/uscan.pl:977 +msgid "See L<COPYRIGHT FILE EXAMPLES>." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:919 +msgid "HTTP site (filenamemangle)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:921 +msgid "" +"The upstream tarball filename is found by taking the last component of the " +"URL and removing everything after any '?' or '#'." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:924 +msgid "" +"If this does not fit to you, use B<filenamemangle>. For example, F<< <A " +"href=\"http://foo.bar.org/dl/?path=&dl=foo-0.1.1.tar.gz\"> >> could be " +"handled as:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:928 +#, no-wrap +msgid "" +" version=4\n" +" opts=filenamemangle=s/.*=(.*)/$1/ \\\n" +" http://foo.bar.org/dl/\\?path=&dl=foo-(.+)\\.tar\\.gz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:933 +msgid "" +"F<< <A href=\"http://foo.bar.org/dl/?path=&dl_version=0.1.1\"> >> could be " +"handled as:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:936 +#, no-wrap +msgid "" +" version=4\n" +" opts=filenamemangle=s/.*=(.*)/foo-$1\\.tar\\.gz/ \\\n" +" http://foo.bar.org/dl/\\?path=&dl_version=(.+) \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:941 +msgid "" +"If the href string has no version using <I>matching-pattern>, the version " +"can be obtained from the full URL using B<filenamemangle>." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:944 +#, no-wrap +msgid "" +" version=4\n" +" opts=filenamemangle=s&.*/dl/(.*)/foo\\.tar\\.gz&foo-$1\\.tar\\.gz& \\\n" +" http://foo.bar.org/dl/([\\.\\d]+)/ foo.tar.gz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:950 +msgid "HTTP site (downloadurlmangle)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:952 +msgid "" +"The option B<downloadurlmangle> can be used to mangle the URL of the file to " +"download. This can only be used with B<http://> URLs. This may be " +"necessary if the link given on the web page needs to be transformed in some " +"way into one which will work automatically, for example:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:957 +#, no-wrap +msgid "" +" version=4\n" +" opts=downloadurlmangle=s/prdownload/download/ \\\n" +" http://developer.berlios.de/project/showfiles.php?group_id=2051 \\\n" +" http://prdownload.berlios.de/softdevice/vdr-softdevice-(.+).tgz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:963 +msgid "HTTP site (oversionmangle, MUT)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:965 +msgid "" +"The option B<oversionmangle> can be used to mangle the version of the source " +"tarball (B<.orig.tar.gz> and B<.orig-bar.tar.gz>). For example, B<+dfsg1> " +"can be added to the upstream version as:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:969 +#, no-wrap +msgid "" +" version=4\n" +" opts=oversionmangle=s/(.*)/$1+dfsg1/ \\\n" +" http://example.com/~user/release/foo.html \\\n" +" files/foo-([\\d\\.]*).tar.gz debian\n" +" opts=\"component=bar\" \\\n" +" http://example.com/~user/release/foo.html \\\n" +" files/bar-([\\d\\.]*).tar.gz same uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:979 +msgid "HTTP site (pagemangle)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:981 +msgid "" +"The option B<pagemangle> can be used to mangle the downloaded web page " +"before applying other rules. The non-standard web page without proper B<< " +"<a href=\" >> << ... >> B<< \"> >> entries can be converted. For example, " +"if F<foo.html> uses B<< <a bogus=\" >> I<< ... >> B<< \"> >>, this can be " +"converted to the standard page format with:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:987 +#, no-wrap +msgid "" +" version=4\n" +" opts=pagemangle=\"s/<a\\s+bogus=/<a href=/g\" \\\n" +" http://example.com/release/@PACKAGE@.html \\\n" +" files/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:992 +msgid "Please note the use of B<g> here to replace all occurrences." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:994 +msgid "" +"If F<foo.html> uses B<< <Key> >> I<< ... >> B<< </Key> >>, this can be " +"converted to the standard page format with:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:997 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pagemangle=s%<Key>([^<]*)</Key>%<Key><a " +"href=\"$1\">$1</a></Key>%g\" \\\\\n" +" http://localhost:$PORT/ \\\n" +" (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1002 +msgid "FTP site (basic):" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1004 +#, no-wrap +msgid "" +" version=4\n" +" ftp://ftp.tex.ac.uk/tex-archive/web/c_cpp/cweb/cweb-(.+)\\.tar\\.gz \\\n" +" debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1008 +msgid "FTP site (regex special characters):" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1010 +#, no-wrap +msgid "" +" version=4\n" +" ftp://ftp.worldforge.org/pub/worldforge/libs/\\\n" +" Atlas-C++/transitional/Atlas-C\\+\\+-(.+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1014 +msgid "" +"Please note that this URL is connected to be I< ... >B<libs/Atlas-C++/>I< " +"... > . For B<++>, the first one in the directory path is verbatim while the " +"one in the filename is escaped by B<\\>." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1018 +msgid "FTP site (funny version)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1020 +msgid "" +"This is another way of handling site with funny version numbers, this time " +"using mangling. (Note that multiple groups will be concatenated before " +"mangling is performed, and that mangling will only be performed on the " +"basename version number, not any path version numbers.)" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1026 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"uversionmangle=s/^/0.0./\" \\\n" +" ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/\\\n" +" development/Wine-(.+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1031 +msgid "sf.net" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1033 +msgid "" +"For SourceForge based projects, qa.debian.org runs a redirector which allows " +"a simpler form of URL. The format below will automatically be rewritten to " +"use the redirector with the watch file:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1037 +#, no-wrap +msgid "" +" version=4\n" +" http://sf.net/<project>/ <tar-name>-(.+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1040 +msgid "For B<audacity>, set the watch file as:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1042 +#, no-wrap +msgid "" +" version=4\n" +" http://sf.net/audacity/ audacity-minsrc-(.+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1045 ../scripts/uscan.pl:1085 +msgid "" +"Please note, you can still use normal functionalities of B<uscan> to set up " +"a watch file for this site without using the redirector." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1048 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"uversionmangle=s/-pre/~pre/, \\\n" +"\tfilenamemangle=s%(?:.*)audacity-minsrc-(.+)\\.tar\\.xz/download%\\\n" +" audacity-$1.tar.xz%\" \\\n" +"\thttp://sourceforge.net/projects/audacity/files/audacity/(\\d[\\d\\.]+)/ \\" +"\n" +"\t(?:.*)audacity-minsrc-([\\d\\.]+)\\.tar\\.xz/download debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1055 +msgid "Here, B<%> is used as the separator instead of the standard B</>." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1057 +msgid "github.com" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1059 +msgid "" +"For GitHub based projects, you can use the tags or releases page. The " +"archive URL uses only the version as the filename. You can rename the " +"downloaded upstream tarball from into the standard F<< <project>-" +"<version>.tar.gz >> using B<filenamemangle>:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1064 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"filenamemangle=s%(?:.*?)?v?(\\d[\\d.]*)\\.tar\\.gz%<project>-" +"$1.tar.gz%\" \\\n" +" https://github.com/<user>/<project>/tags \\\n" +" (?:.*?/)?v?(\\d[\\d.]*)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1069 +msgid "PyPI" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1071 +msgid "" +"For PyPI based projects, pypi.debian.net runs a redirector which allows a " +"simpler form of URL. The format below will automatically be rewritten to use " +"the redirector with the watch file:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1075 +#, no-wrap +msgid "" +" version=4\n" +" https://pypi.python.org/packages/source/<initial>/<project>/ \\\n" +" <tar-name>-(.+)\\.tar\\.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1079 +msgid "For B<cfn-sphere>, set the watch file as:" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1081 +#, no-wrap +msgid "" +" version=4\n" +" https://pypi.python.org/packages/source/c/cfn-sphere/ \\\n" +" cfn-sphere-([\\d\\.]+).tar.gz debian uupdate\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1088 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"pgpmode=none, \\\n" +" https://pypi.python.org/pypi/cfn-sphere/ \\\n" +" https://pypi.python.org/packages/source/c/cfn-sphere/\\\n" +" cfn-sphere-([\\d\\.]+).tar.gz#.* debian uupdate\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1094 +msgid "code.google.com" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1096 +msgid "" +"Sites which used to be hosted on the Google Code service should have " +"migrated to elsewhere (github?). Please look for the newer upstream site." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1099 +msgid "direct access to the git repository" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1101 +msgid "" +"If the upstream only publishes its code via the git repository and it has no " +"web interface to obtain the releasse tarball, you can use uscan with the " +"tags of the git repository." +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1105 +#, no-wrap +msgid "" +" version=4\n" +" opts=\"mode=git\" http://git.ao2.it/tweeper.git \\\n" +" refs/tags/v([\\d\\.]+) debian uupdate\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1109 +msgid "" +"Please note \"B<git ls-remote>\" is used to obtain references for tags. If " +"a tag B<v20.5> is the newest tag, the above example downloads I<spkg>B<-" +"20.5.tar.xz>." +msgstr "" + +#. type: =head1 +#: ../scripts/uscan.pl:1112 +msgid "COPYRIGHT FILE EXAMPLES" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1114 +msgid "" +"Here is an example for the F<debian/copyright> file which initiates " +"automatic repackaging of the upstream tarball into I<< " +"<spkg>_<oversion>.orig.tar.gz >> (In F<debian/copyright>, the B<Files-" +"Excluded> and B<Files-Excluded->I<component> stanzas are a part of the first " +"paragraph and there is a blank line before the following paragraphs which " +"contain B<Files> and other stanzas.):" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1121 +#, no-wrap +msgid "" +" Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\n" +" Files-Excluded: exclude-this\n" +" exclude-dir\n" +" */exclude-dir\n" +" .*\n" +" */js/jquery.js\n" +"\n" +msgstr "" + +#. type: verbatim +#: ../scripts/uscan.pl:1128 ../scripts/uscan.pl:1149 +#, no-wrap +msgid "" +" Files: *\n" +" Copyright: ...\n" +" ...\n" +"\n" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1132 msgid "" -"This is a syntactic shorthand for " -"B<uversionmangle=>I<rules>B<,dversionmangle=>I<rules>, applying the same " -"rules to both the upstream and Debian version numbers." +"Here is another example for the F<debian/copyright> file which initiates " +"automatic repackaging of the multiple upstream tarballs into I<< " +"<spkg>_<oversion>.orig.tar.gz >> and I<< <spkg>_<oversion>.orig-bar.tar.gz " +">>:" msgstr "" -#. type: TP -#: ../scripts/uscan.1:274 +#. type: verbatim +#: ../scripts/uscan.pl:1137 #, no-wrap -msgid "B<filenamemangle=>I<rules>" +msgid "" +" Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\n" +" Files-Excluded: exclude-this\n" +" exclude-dir\n" +" */exclude-dir\n" +" .*\n" +" */js/jquery.js\n" +" Files-Excluded-bar: exclude-this\n" +" exclude-dir\n" +" */exclude-dir\n" +" .*\n" +" */js/jquery.js\n" +"\n" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:280 -msgid "" -"This is used to mangle the filename with which the downloaded file will be " -"saved, and is parsed in the same way as the B<uversionmangle> option. " -"Examples of its use are given in the examples section above." +#. type: textblock +#: ../scripts/uscan.pl:1153 +msgid "See mk-origtargz(1)." msgstr "" -#. type: TP -#: ../scripts/uscan.1:280 -#, no-wrap -msgid "B<downloadurlmangle=>I<rules>" +#. type: =head1 +#: ../scripts/uscan.pl:1155 +msgid "KEYRING FILE EXAMPLES" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:288 +#. type: textblock +#: ../scripts/uscan.pl:1157 msgid "" -"This is used to mangle the URL to be used for the download. The URL is " -"first computed based on the homepage downloaded and the pattern matched, " -"then the version number is determined from this URL. Finally, any rules " -"given by this option are applied before the actual download attempt is made. " -"An example of its use is given in the examples section above." +"Let's assume that the upstream \"B<< uscan test key (no secret) " +"<none@debian.org> >>\" signs its package and publishes its public key " +"fingerprint 'B<CF21 8F0E 7EAB F584 B7E2 0402 C77E 2D68 7254 3FAF>' which you " +"know is the trusted one." msgstr "" -#. type: TP -#: ../scripts/uscan.1:288 -#, no-wrap -msgid "B<pgpsigurlmangle=>I<rules>" +#. type: textblock +#: ../scripts/uscan.pl:1162 +msgid "" +"Please note that the short keyid B<72543FAF> is the last 4 Bytes, the long " +"keyid B<C77E2D6872543FAF> is the last 8 Bytes, and the finger print is the " +"last 20 Bytes of the public key in hexadecimal form. You can save typing by " +"using the short keyid but you must verify the OpenPGP key using its " +"fingerprint." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:299 +#. type: textblock +#: ../scripts/uscan.pl:1167 msgid "" -"If present, the supplied rules will be applied to the downloaded URL (after " -"any downloadurlmangle rules, if present) to craft a new URL that will be " -"used to fetch the detached OpenPGP signature file for the upstream tarball. " -"Some common rules might be `B<s/$/.asc/>' or `B<s/$/.pgp/>' or " -"`B<s/$/.gpg/>'. This signature must be made by a key found in the keyring " -"B<debian/upstream/signing-key.pgp> or the armored keyring " -"B<debian/upstream/signing-key.asc>. If it is not valid, or not made by one " -"of the listed keys, uscan will report an error." +"The armored keyring file F<debian/upstream/signing-key.asc> can be created " +"by using the B<gpg> (or B<gpg2>) command as follows." msgstr "" -#. type: TP -#: ../scripts/uscan.1:299 +#. type: verbatim +#: ../scripts/uscan.pl:1170 #, no-wrap -msgid "B<repacksuffix=>I<suffix>" +msgid "" +" $ gpg --recv-keys \"72543FAF\"\n" +" ...\n" +" $ gpg --finger \"72543FAF\"\n" +" pub 4096R/72543FAF 2015-09-02\n" +" Key fingerprint = CF21 8F0E 7EAB F584 B7E2 0402 C77E 2D68 7254 " +"3FAF\n" +" uid uscan test key (no secret) <none@debian.org>\n" +" sub 4096R/52C6ED39 2015-09-02\n" +" $ cd path/to/<upkg>-<uversion>\n" +" $ mkdir -p debian/upstream\n" +" $ gpg --export --export-options export-minimal --armor \\\n" +" 'CF21 8F0E 7EAB F584 B7E2 0402 C77E 2D68 7254 3FAF' \\\n" +" >debian/upstream/signing-key.asc\n" +"\n" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:306 +#. type: textblock +#: ../scripts/uscan.pl:1183 msgid "" -"If the upstream sources are modified because I<debian/copyright> contains " -"the B<Files-Excluded> field, I<suffix> will be appended to the upstream " -"version of the repacked tar archive. Common suffixes might be B<+dfsg1> to " -"indicate the removal of files that are not DFSG-compliant or B<+ds1> for " -"other reasons such as removal of prebuilt files or large embedded code " -"copies." +"The binary keyring file can be created instead by skipping B<--armor> and " +"changing the storing file to F<debian/upstream/signing-key.pgp> in the above " +"example. If a group of developers sign the package, you need to list " +"fingerprints of all of them in the argument for B<gpg --export ...> to make " +"the keyring to contain all OpenPGP keys of them." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:321 +#. type: textblock +#: ../scripts/uscan.pl:1189 msgid "" -"Similarly to several other scripts in the B<devscripts> package, B<uscan> " -"explores the requested directory trees looking for I<debian/changelog> and " -"I<debian/watch> files. As a safeguard against stray files causing potential " -"problems, and in order to promote efficiency, it will examine the name of " -"the parent directory once it finds the I<debian/changelog> file, and check " -"that the directory name corresponds to the package name. It will only " -"attempt to download newer versions of the package and then perform any " -"requested action if the directory name matches the package name. Precisely " -"how it does this is controlled by two configuration file variables " -"B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> and B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, and " -"their corresponding command-line options B<--check-dirname-level> and B<--" -"check-dirname-regex>." +"Sometimes you may wonder who made a signature file. You can get the public " +"keyid used to create the detached signature file F<foo-2.0.tar.gz.asc> by " +"running B<gpg> as:" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:332 +#. type: verbatim +#: ../scripts/uscan.pl:1193 +#, no-wrap msgid "" -"Only check the directory name if we have had to change directory in our " -"search for I<debian/changelog>, that is, the directory containing " -"I<debian/changelog> is not the directory from which B<uscan> was invoked. " -"This is the default behaviour." +" $ gpg -vv foo-2.0.tar.gz.asc\n" +" gpg: armor: BEGIN PGP SIGNATURE\n" +" gpg: armor header: Version: GnuPG v1\n" +" :signature packet: algo 1, keyid C77E2D6872543FAF\n" +" \tversion 4, created 1445177469, md5len 0, sigclass 0x00\n" +" \tdigest algo 2, begin of digest 7a c7\n" +" \thashed subpkt 2 len 4 (sig created 2015-10-18)\n" +" \tsubpkt 16 len 8 (issuer key ID C77E2D6872543FAF)\n" +" \tdata: [4091 bits]\n" +" gpg: assuming signed data in `foo-2.0.tar.gz'\n" +" gpg: Signature made Sun 18 Oct 2015 11:11:09 PM JST using RSA key ID " +"72543FAF\n" +" ...\n" +"\n" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:350 -msgid "This script will perform a fully automatic upstream update." +#. type: =head1 +#: ../scripts/uscan.pl:1206 +msgid "COMMANDLINE OPTIONS" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:358 -#, no-wrap -msgid "" -"#!/bin/sh -e\n" -"# called with '--upstream-version' E<lt>versionE<gt> E<lt>fileE<gt>\n" -"uupdate \"$@\"\n" -"package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`\n" -"cd ../$package-$2\n" -"debuild\n" +#. type: textblock +#: ../scripts/uscan.pl:1208 +msgid "For the basic usage, B<uscan> does not require to set these options." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:363 +#. type: textblock +#: ../scripts/uscan.pl:1214 msgid "" -"Note that we don't call B<dupload> or B<dput> automatically, as the " -"maintainer should perform sanity checks on the software before uploading it " -"to Debian." +"Don't read any configuration files. This can only be used as the first " +"option given on the command-line." msgstr "" -#. type: TP -#: ../scripts/uscan.1:364 -#, no-wrap -msgid "B<--report>, B<--no-download>" +#. type: =item +#: ../scripts/uscan.pl:1217 +msgid "B<--no-verbose>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:367 +#. type: textblock +#: ../scripts/uscan.pl:1219 +msgid "Don't report verbose information. (default)" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1221 +msgid "B<--verbose>, B<-v>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1223 +msgid "Report verbose information." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1225 +msgid "B<--debug>, B<-vv>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1227 msgid "" -"Only report about available newer versions but do not download anything." +"Report verbose information including the downloaded web pages as processed " +"to STDERR for debugging." msgstr "" -#. type: TP -#: ../scripts/uscan.1:367 -#, no-wrap -msgid "B<--report-status>" +#. type: =item +#: ../scripts/uscan.pl:1230 +msgid "B<--dehs>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:371 +#. type: textblock +#: ../scripts/uscan.pl:1232 msgid "" -"Report on the status of all packages, even those which are up-to-date, but " -"do not download anything." +"Send DEHS style output (XML-type) to STDOUT, while send all other uscan " +"output to STDERR." msgstr "" -#. type: TP -#: ../scripts/uscan.1:371 -#, no-wrap -msgid "B<--download>" +#. type: =item +#: ../scripts/uscan.pl:1235 +msgid "B<--no-dehs>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:374 -msgid "Report and download. (This is the default behaviour.)" +#. type: textblock +#: ../scripts/uscan.pl:1237 +msgid "Use only traditional uscan output format. (default)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:374 -#, no-wrap -msgid "B<--destdir>" +#. type: =item +#: ../scripts/uscan.pl:1239 +msgid "B<--download>, B<-d>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:379 +#. type: textblock +#: ../scripts/uscan.pl:1241 +msgid "Download the new upstream release. (default)" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1243 +msgid "B<--force-download>, B<-dd>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1245 msgid "" -"Path of directory to which to download. If the specified path is not " -"absolute, it will be relative to one of the current directory or, if " -"directory scanning is enabled, the package's source directory." +"Download the new upstream release even if up-to-date. (may not overwrite the " +"local file)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:379 -#, no-wrap -msgid "B<--force-download>" +#. type: =item +#: ../scripts/uscan.pl:1247 +msgid "B<--overwrite-download>, B<-ddd>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:382 +#. type: textblock +#: ../scripts/uscan.pl:1249 msgid "" -"Download upstream even if up to date (will not overwrite local files, " -"however)" +"Download the new upstream release even if up-to-date. (may overwrite the " +"local file)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:382 -#, no-wrap -msgid "B<--pasv>" +#. type: =item +#: ../scripts/uscan.pl:1251 +msgid "B<--no-download>, B<--nodownload>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:385 -msgid "Force PASV mode for FTP connections." +#. type: textblock +#: ../scripts/uscan.pl:1253 +msgid "Don't download and report information." msgstr "" -#. type: TP -#: ../scripts/uscan.1:385 -#, no-wrap -msgid "B<--no-pasv>" +#. type: textblock +#: ../scripts/uscan.pl:1255 +msgid "Previously downloaded tarballs may be used." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:388 -msgid "Do not use PASV mode for FTP connections." +#. type: textblock +#: ../scripts/uscan.pl:1257 +msgid "Change default to B<--skip-signature>." msgstr "" -#. type: TP -#: ../scripts/uscan.1:388 -#, no-wrap -msgid "B<--timeout> I<N>" +#. type: =item +#: ../scripts/uscan.pl:1259 +msgid "B<--signature>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:391 -msgid "Set timeout to N seconds (default 20 seconds)." +#. type: textblock +#: ../scripts/uscan.pl:1261 +msgid "Download signature. (default)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:391 ../scripts/uupdate.1:77 -#, no-wrap -msgid "B<--no-symlink>" +#. type: =item +#: ../scripts/uscan.pl:1263 +msgid "B<--no-signature>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:394 -msgid "Do not call B<mk-origtargz>." +#. type: textblock +#: ../scripts/uscan.pl:1265 +msgid "Don't download signature but verify if already downloaded." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:396 -msgid "The following options are passed to B<mk-origtargz>:" +#. type: =item +#: ../scripts/uscan.pl:1267 +msgid "B<--skip-signature>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:402 -msgid "" -"Make I<orig.tar.gz> (with the appropriate extension) symlinks to the " -"downloaded files. (This is the default behaviour.)" +#. type: textblock +#: ../scripts/uscan.pl:1269 +msgid "Don't bother download signature nor verifying signature." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:405 -msgid "Instead of symlinking as described above, copy the downloaded files." +#. type: =item +#: ../scripts/uscan.pl:1271 +msgid "B<--safe>, B<--report>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:408 +#. type: textblock +#: ../scripts/uscan.pl:1273 msgid "" -"Instead of symlinking as described above, rename the downloaded files." +"Avoid running unsafe scripts by skipping both the repacking of the " +"downloaded package and the updating of the new source tree." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:414 +#. type: textblock +#: ../scripts/uscan.pl:1276 +msgid "Change default to B<--no-download> and B<--skip-signature>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1278 msgid "" -"After having downloaded an lzma tar, xz tar, bzip tar or zip archive, repack " -"it to a gzip tar archive, if required. The B<unzip> package must be " -"installed in order to repack .zip archives, the B<xz-utils> package must be " -"installed to repack lzma or xz tar archives." +"When the objective of running B<uscan> is to gather the upstream package " +"status under the security conscious environment, please make sure to use " +"this option." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:420 +#. type: =item +#: ../scripts/uscan.pl:1281 +msgid "B<--report-status>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1283 +msgid "This is equivalent of setting \"B<--verbose --safe>\"." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1285 +msgid "B<--download-version> I<version>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1287 msgid "" -"In the case where the upstream sources are repacked (either because B<--" -"repack> option is given or I<debian/copyright> contains the field B<Files-" -"Excluded>), it is possible to control the compression method via the " -"parameter (defaults to B<gzip>)." +"Specify the I<version> which the upstream release must match in order to be " +"considered, rather than using the release with the highest version. (a best " +"effort feature)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:420 -#, no-wrap -msgid "B<--copyright-file >I<copyright-file>" +#. type: =item +#: ../scripts/uscan.pl:1291 +msgid "B<--download-debversion> I<version>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:424 +#. type: textblock +#: ../scripts/uscan.pl:1293 msgid "" -"Exclude files mentioned in B<Files-Excluded> in the given copyright file. " -"This is useful when running uscan not within a source package directory." +"Specify the Debian package version to download the corresponding upstream " +"release version. The B<dversionmangle> and B<uversionmangle> rules are " +"considered. (a best effort feature)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:425 -#, no-wrap -msgid "B<--dehs>" +#. type: =item +#: ../scripts/uscan.pl:1297 +msgid "B<--download-current-version>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:428 -msgid "Use an XML format for output, as required by the DEHS system." +#. type: textblock +#: ../scripts/uscan.pl:1299 +msgid "Download the currently packaged version. (a best effort feature)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:428 -#, no-wrap -msgid "B<--no-dehs>" +#. type: textblock +#: ../scripts/uscan.pl:1304 ../scripts/uscan.pl:1308 +msgid "" +"See the below section L<Directory name checking> for an explanation of this " +"option." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:431 +#. type: =item +#: ../scripts/uscan.pl:1310 +msgid "B<--destdir>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1312 msgid "" -"Use the traditional uscan output format. (This is the default behaviour.)" +"Set the path of directory to which to download instead of its default " +"F<../>. If the specified path is not absolute, it will be relative to one " +"of the current directory or, if directory scanning is enabled, the package's " +"source directory." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:440 +#. type: textblock +#: ../scripts/uscan.pl:1319 msgid "" "Specify the name of the package to check for rather than examining " -"I<debian/changelog>; this requires the B<--upstream-version> (unless a " -"version is specified in the I<watch> file) and B<--watchfile> options as " +"F<debian/changelog>; this requires the B<--upstream-version> (unless a " +"version is specified in the F<watch> file) and B<--watchfile> options as " "well. Furthermore, no directory scanning will be done and nothing will be " -"downloaded. This option is probably most useful in conjunction with the " -"DEHS system (and B<--dehs>)." +"downloaded. This option automatically sets B<--no-download> and B<--skip-" +"signature>; and probably most useful in conjunction with the DEHS system " +"(and B<--dehs>)." msgstr "" -#. type: TP -#: ../scripts/uscan.1:440 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1326 msgid "B<--upstream-version> I<upstream-version>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:445 +#. type: textblock +#: ../scripts/uscan.pl:1328 msgid "" -"Specify the current upstream version rather than examine the I<watch> file " -"or I<changelog> to determine it. This is ignored if a directory scan is " -"being performed and more than one I<watch> file is found." +"Specify the current upstream version rather than examine F<debian/watch> or " +"F<debian/changelog> to determine it. This is ignored if a directory scan is " +"being performed and more than one F<debian/watch> file is found." msgstr "" -#. type: TP -#: ../scripts/uscan.1:445 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1332 msgid "B<--watchfile> I<watchfile>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:452 +#. type: textblock +#: ../scripts/uscan.pl:1334 msgid "" "Specify the I<watchfile> rather than perform a directory scan to determine " -"it. If this option is used without B<--package>, then B<uscan> must be " +"it. If this option is used without B<--package>, then B<uscan> must be " "called from within the Debian package source tree (so that " -"I<debian/changelog> can be found simply by stepping up through the tree)." +"F<debian/changelog> can be found simply by stepping up through the tree)." msgstr "" -#. type: TP -#: ../scripts/uscan.1:452 -#, no-wrap -msgid "B<--download-version> I<version>" +#. type: =item +#: ../scripts/uscan.pl:1340 +msgid "B<--bare>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:456 +#. type: textblock +#: ../scripts/uscan.pl:1342 +msgid "" +"Disable all site specific special case codes to perform URL redirections and " +"page content alterations." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1345 +msgid "B<--no-exclusion>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1347 msgid "" -"Specify the version which the upstream release must match in order to be " -"considered, rather than using the release with the highest version." +"Don't automatically exclude files mentioned in F<debian/copyright> field " +"B<Files-Excluded>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1349 +msgid "B<--pasv>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1351 +msgid "Force PASV mode for FTP connections." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1353 +msgid "B<--no-pasv>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1355 +msgid "Don't use PASV mode for FTP connections." msgstr "" #. type: TP -#: ../scripts/uscan.1:456 +#: ../scripts/uscan.pl:1357 ../scripts/uupdate.1:83 #, no-wrap -msgid "B<--download-current-version>" +msgid "B<--no-symlink>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:459 -msgid "Download the currently packaged version" +#. type: textblock +#: ../scripts/uscan.pl:1359 +msgid "Don't call B<mk-origtargz>." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:462 ../scripts/uupdate.1:77 -msgid "Give verbose output." +#. type: =item +#: ../scripts/uscan.pl:1361 +msgid "B<--timeout> I<N>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1363 +msgid "Set timeout to I<N> seconds (default 20 seconds)." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1365 +msgid "B<--user-agent>, B<--useragent>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1367 +msgid "Override the default user agent header." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1371 +msgid "Give brief usage information." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1379 +msgid "" +"B<uscan> also accepts following options and passes them to B<mk-origtargz>:" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1385 +msgid "" +"Make B<orig.tar.gz> (with the appropriate extension) symlink to the " +"downloaded files. (This is the default behavior.)" msgstr "" -#. type: TP -#: ../scripts/uscan.1:462 -#, no-wrap -msgid "B<--no-verbose>" +#. type: textblock +#: ../scripts/uscan.pl:1390 +msgid "Instead of symlinking as described above, copy the downloaded files." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:465 -msgid "Don't give verbose output. (This is the default behaviour.)" +#. type: textblock +#: ../scripts/uscan.pl:1394 +msgid "" +"Instead of symlinking as described above, rename the downloaded files." msgstr "" -#. type: TP -#: ../scripts/uscan.1:465 -#, no-wrap -msgid "B<--no-exclusion>" +#. type: textblock +#: ../scripts/uscan.pl:1398 +msgid "" +"After having downloaded an lzma tar, xz tar, bzip tar, gz tar, zip, jar, xip " +"archive, repack it to the specified compression (see B<--compression>)." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:469 +#. type: textblock +#: ../scripts/uscan.pl:1401 msgid "" -"Do not automatically exclude files mentioned in I<debian/copyright> field " -"B<Files-Excluded>" +"The unzip package must be installed in order to repack zip and jar archives, " +"the mozilla-devscripts package must be installed to repack xip archives, and " +"the xz-utils package must be installed to repack lzma or xz tar archives." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:472 +#. type: textblock +#: ../scripts/uscan.pl:1407 msgid "" -"Dump the downloaded web pages to stdout for debugging your watch file." +"In the case where the upstream sources are repacked (either because B<--" +"repack> option is given or F<debian/copyright> contains the field B<Files-" +"Excluded>), it is possible to control the compression method via the " +"parameter. The default is B<gzip> for normal tarballs, and B<xz> for " +"tarballs generated directly from the git repository." msgstr "" -#. type: TP -#: ../scripts/uscan.1:480 -#, no-wrap -msgid "B<--user-agent>, B<--useragent>" +#. type: =item +#: ../scripts/uscan.pl:1413 +msgid "B<--copyright-file> I<copyright-file>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:483 -msgid "Override the default user agent header." +#. type: textblock +#: ../scripts/uscan.pl:1415 +msgid "" +"Exclude files mentioned in B<Files-Excluded> in the given I<copyright-file>. " +" This is useful when running B<uscan> not within a source package directory." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:490 -msgid "Give brief usage information." +#. type: =head1 +#: ../scripts/uscan.pl:1420 +msgid "DEVSCRIPT CONFIGURATION VARIABLES" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:500 +#. type: textblock +#: ../scripts/uscan.pl:1422 msgid "" -"The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are " -"sourced by a shell in that order to set configuration variables. These may " -"be overridden by command line options. Environment variable settings are " -"ignored for this purpose. If the first command line option given is B<--" -"noconf>, then these files will not be read. The currently recognised " +"For the basic usage, B<uscan> does not require to set these configuration " +"variables." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1425 +msgid "" +"The two configuration files F</etc/devscripts.conf> and F<~/.devscripts> are " +"sourced by a shell in that order to set configuration variables. These may " +"be overridden by command line options. Environment variable settings are " +"ignored for this purpose. If the first command line option given is B<--" +"noconf>, then these files will not be read. The currently recognized " "variables are:" msgstr "" -#. type: TP -#: ../scripts/uscan.1:500 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1434 msgid "B<USCAN_DOWNLOAD>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:505 +#. type: textblock +#: ../scripts/uscan.pl:1436 msgid "" -"If this is set to I<no>, then newer upstream files will not be downloaded; " -"this is equivalent to the B<--report> or B<--no-download> options." +"If this is set to B<no>, then newer upstream files will not be downloaded; " +"this is equivalent to the B<--no-download> options." msgstr "" -#. type: TP -#: ../scripts/uscan.1:505 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1439 +msgid "B<USCAN_SAFE>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1441 +msgid "" +"If this is set to B<yes>, then B<uscan> avoids running unsafe scripts by " +"skipping both the repacking of the downloaded package and the updating of " +"the new source tree; this is equivalent to the B<--safe> options; this also " +"sets the default to B<--no-download> and B<--skip-signature>." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1446 msgid "B<USCAN_PASV>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:511 +#. type: textblock +#: ../scripts/uscan.pl:1448 msgid "" -"If this is set to I<yes> or I<no>, this will force FTP connections to use " -"PASV mode or not to, respectively. If this is set to I<default>, then " -"B<Net::FTP>(3) makes the choice (primarily based on the B<FTP_PASSIVE> " -"environment variable)." +"If this is set to yes or no, this will force FTP connections to use PASV " +"mode or not to, respectively. If this is set to default, then B<Net::FTP(3)> " +"makes the choice (primarily based on the B<FTP_PASSIVE> environment " +"variable)." msgstr "" -#. type: TP -#: ../scripts/uscan.1:511 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1452 msgid "B<USCAN_TIMEOUT>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:515 +#. type: textblock +#: ../scripts/uscan.pl:1454 msgid "" -"If set to a number I<N>, then set the timeout to I<N> seconds. This is " +"If set to a number I<N>, then set the timeout to I<N> seconds. This is " "equivalent to the B<--timeout> option." msgstr "" -#. type: TP -#: ../scripts/uscan.1:515 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1457 msgid "B<USCAN_SYMLINK>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:522 +#. type: textblock +#: ../scripts/uscan.pl:1459 msgid "" -"If this is set to I<no>, then a pkg_version.orig.tar.{gz|bz2|lzma|xz} " -"symlink will not be made (equivalent to the B<--no-symlink> option). If it " -"is set to I<yes> or I<symlink>, then the symlinks will be made. If it is " -"set to I<rename>, then the files are renamed (equivalent to the B<--rename> " -"option)." +"If this is set to no, then a I<pkg>_I<version>B<.orig.tar.{gz|bz2|lzma|xz}> " +"symlink will not be made (equivalent to the B<--no-symlink> option). If it " +"is set to B<yes> or B<symlink>, then the symlinks will be made. If it is set " +"to rename, then the files are renamed (equivalent to the B<--rename> option)." msgstr "" -#. type: TP -#: ../scripts/uscan.1:522 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1464 msgid "B<USCAN_DEHS_OUTPUT>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:526 +#. type: textblock +#: ../scripts/uscan.pl:1466 msgid "" -"If this is set to I<yes>, then DEHS-style output will be used. This is " +"If this is set to B<yes>, then DEHS-style output will be used. This is " "equivalent to the B<--dehs> option." msgstr "" -#. type: TP -#: ../scripts/uscan.1:526 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1469 msgid "B<USCAN_VERBOSE>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:530 +#. type: textblock +#: ../scripts/uscan.pl:1471 msgid "" -"If this is set to I<yes>, then verbose output will be given. This is " +"If this is set to B<yes>, then verbose output will be given. This is " "equivalent to the B<--verbose> option." msgstr "" -#. type: TP -#: ../scripts/uscan.1:530 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1474 msgid "B<USCAN_USER_AGENT>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:534 +#. type: textblock +#: ../scripts/uscan.pl:1476 msgid "" "If set, the specified user agent string will be used in place of the " "default. This is equivalent to the B<--user-agent> option." msgstr "" -#. type: TP -#: ../scripts/uscan.1:534 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1479 msgid "B<USCAN_DESTDIR>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:538 +#. type: textblock +#: ../scripts/uscan.pl:1481 msgid "" "If set, the downloaded files will be placed in this directory. This is " "equivalent to the B<--destdir> option." msgstr "" -#. type: TP -#: ../scripts/uscan.1:538 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1484 msgid "B<USCAN_REPACK>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:543 +#. type: textblock +#: ../scripts/uscan.pl:1486 msgid "" -"If this is set to I<yes>, then after having downloaded a bzip tar, lzma tar, " -"xz tar, or zip archive, B<uscan> will repack it to a gzip tar. This is " -"equivalent to the B<--repack> option." +"If this is set to yes, then after having downloaded a bzip tar, lzma tar, xz " +"tar, or zip archive, uscan will repack it to the specified compression (see " +"B<--compression>). This is equivalent to the B<--repack> option." msgstr "" -#. type: TP -#: ../scripts/uscan.1:543 -#, no-wrap +#. type: =item +#: ../scripts/uscan.pl:1490 msgid "B<USCAN_EXCLUSION>" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:548 +#. type: textblock +#: ../scripts/uscan.pl:1492 msgid "" -"If this is set to I<no>, files mentioned in the field B<Files-Excluded> of " -"I<debian/copyright> will be ignored and no exclusion of files will be tried. " +"If this is set to no, files mentioned in the field B<Files-Excluded> of " +"F<debian/copyright> will be ignored and no exclusion of files will be tried. " " This is equivalent to the B<--no-exclusion> option." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:552 +#. type: textblock +#: ../scripts/uscan.pl:1500 msgid "" "The exit status gives some indication of whether a newer version was found " "or not; one is advised to read the output to determine exactly what happened " "and whether there were any warnings to be noted." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:556 +#. type: textblock +#: ../scripts/uscan.pl:1508 msgid "" -"Either B<--help> or B<--version> was used, or for some I<watch> file which " +"Either B<--help> or B<--version> was used, or for some F<watch> file which " "was examined, a newer upstream version was located." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:560 +#. type: textblock +#: ../scripts/uscan.pl:1513 msgid "" -"No newer upstream versions were located for any of the I<watch> files " +"No newer upstream versions were located for any of the F<watch> files " "examined." msgstr "" -#. type: SH -#: ../scripts/uscan.1:560 -#, no-wrap +#. type: =head1 +#: ../scripts/uscan.pl:1517 +msgid "ADVANCED FEATURES" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1519 +msgid "" +"B<uscan> has many other enhanced features which are skipped in the above " +"section for the simplicity. Let's check their highlights." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1522 +msgid "" +"B<uscan> actually scans not just the current directory but all its " +"subdirectories looking for F<debian/watch> to process them all. See " +"L<Directory name checking>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1526 +msgid "" +"B<uscan> can be executed with I<path> as its argument to change the starting " +"directory of search from the current directory to I<path> ." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1529 +msgid "" +"See L<COMMANDLINE OPTIONS> and L<DEVSCRIPT CONFIGURATION VARIABLES> for " +"other variations." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1532 +msgid "Custom script" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1534 +msgid "" +"The optional I<script> parameter in F<debian/watch> means to execute " +"I<script> with options after processing this line if specified." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1537 +msgid "" +"For compatibility with other tools such as B<git-buildpackage>, it may not " +"be wise to create custom scripts with rondom behavior. In general, " +"B<uupdate> is the best choice for the non-native package and custom scripts, " +"if created, should behave as if B<uupdate>. For possible use case, see " +"L<http://bugs.debian.org/748474> as an example." +msgstr "" + +#. type: =head2 +#: ../scripts/uscan.pl:1543 +msgid "URL diversion" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1545 +msgid "" +"Some popular web sites changed their web page structure causing maintenance " +"problems to the watch file. There are some redirection services created to " +"ease maintenance of the watch file. Currently, B<uscan> makes automatic " +"diversion of URL requests to the following URLs to cope with this situation." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1552 +msgid "* L<http://sf.net>" +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1554 +msgid "* L<http://pypi.python.org>" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1560 +msgid "" +"Similarly to several other scripts in the B<devscripts> package, B<uscan> " +"explores the requested directory trees looking for F<debian/changelog> and " +"F<debian/watch> files. As a safeguard against stray files causing potential " +"problems, and in order to promote efficiency, it will examine the name of " +"the parent directory once it finds the F<debian/changelog> file, and check " +"that the directory name corresponds to the package name. It will only " +"attempt to download newer versions of the package and then perform any " +"requested action if the directory name matches the package name. Precisely " +"how it does this is controlled by two configuration file variables " +"B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> and B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, and " +"their corresponding command-line options B<--check-dirname-level> and B<--" +"check-dirname-regex>." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1583 +msgid "" +"Only check the directory name if we have had to change directory in our " +"search for F<debian/changelog>, that is, the directory containing " +"F<debian/changelog> is not the directory from which B<uscan> was invoked. " +"This is the default behavior." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1594 +msgid "" +"The directory name is checked by testing whether the current directory name " +"(as determined by pwd(1)) matches the regex given by the configuration file " +"option B<DEVSCRIPTS_CHECK_DIRNAME_REGEX> or by the command line option B<--" +"check-dirname-regex> I<regex>. Here regex is a Perl regex (see " +"perlre(3perl)), which will be anchored at the beginning and the end. If " +"regex contains a B</>, then it must match the full directory path. If not, " +"then it must match the full directory name. If regex contains the string " +"I<package>, this will be replaced by the source package name, as determined " +"from the F<debian/changelog>. The default value for the regex is: " +"I<package>B<(-.+)?>, thus matching directory names such as I<package> and " +"I<package>-I<version>." +msgstr "" + +#. type: =head1 +#: ../scripts/uscan.pl:1605 msgid "HISTORY AND UPGRADING" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:564 +#. type: textblock +#: ../scripts/uscan.pl:1607 msgid "" -"This section briefly describes the backwards-incompatible I<watch> file " -"features which have been added in each I<watch> file version, and the first " +"This section briefly describes the backwards-incompatible F<watch> file " +"features which have been added in each F<watch> file version, and the first " "version of the B<devscripts> package which understood them." msgstr "" -#. type: TP -#: ../scripts/uscan.1:564 -#, no-wrap -msgid "I<Pre-version 2>" +#. type: =item +#: ../scripts/uscan.pl:1613 +msgid "Pre-version 2" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:569 +#. type: textblock +#: ../scripts/uscan.pl:1615 msgid "" -"The I<watch> file syntax was significantly different in those days. Don't " -"use it. If you are upgrading from a pre-version 2 I<watch> file, you are " +"The F<watch> file syntax was significantly different in those days. Don't " +"use it. If you are upgrading from a pre-version 2 F<watch> file, you are " "advised to read this manpage and to start from scratch." msgstr "" -#. type: TP -#: ../scripts/uscan.1:569 -#, no-wrap -msgid "I<Version 2>" +#. type: =item +#: ../scripts/uscan.pl:1619 +msgid "Version 2" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:573 +#. type: textblock +#: ../scripts/uscan.pl:1621 msgid "" -"devscripts version 2.6.90: The first incarnation of the current style of " -"I<watch> files." +"B<devscripts> version 2.6.90: The first incarnation of the current style of " +"F<watch> files." msgstr "" -#. type: TP -#: ../scripts/uscan.1:573 -#, no-wrap -msgid "I<Version 3>" +#. type: =item +#: ../scripts/uscan.pl:1624 +msgid "Version 3" msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:579 +#. type: textblock +#: ../scripts/uscan.pl:1626 msgid "" -"devscripts version 2.8.12: Introduced the following: correct handling of " +"B<devscripts> version 2.8.12: Introduced the following: correct handling of " "regex special characters in the path part, directory/path pattern matching, " -"version number in several parts, version number mangling. Later versions " +"version number in several parts, version number mangling. Later versions " "have also introduced URL mangling." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:585 +#. type: textblock +#: ../scripts/uscan.pl:1631 msgid "" "If you are upgrading from version 2, the key incompatibility is if you have " "multiple groups in the pattern part; whereas only the first one would be " -"used in version 2, they will all be used in version 3. To avoid this " -"behaviour, change the non-version-number groups to be (?:...) instead of a " -"plain (...) group." +"used in version 2, they will all be used in version 3. To avoid this " +"behavior, change the non-version-number groups to be B<(?:> I< ...> B<)> " +"instead of a plain B<(> I< ... > B<)> group." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:591 +#. type: =item +#: ../scripts/uscan.pl:1639 msgid "" -"B<dpkg>(1), B<mk-origtargz>(1), B<perlre>(1), B<uupdate>(1), " -"B<devscripts.conf>(5)" +"* B<uscan> invokes the custom I<script> as \"I<script> B<--upstream-version> " +"I<version> B<../>I<spkg>B<_>I<version>B<.orig.tar.gz>\"." msgstr "" -#. type: Plain text -#: ../scripts/uscan.1:596 +#. type: =item +#: ../scripts/uscan.pl:1642 msgid "" -"The original version of B<uscan> was written by Christoph Lameter " -"E<lt>clameter@debian.orgE<gt>. Significant improvements, changes and " -"bugfixes were made by Julian Gilbey E<lt>jdg@debian.orgE<gt>. HTTP support " -"was added by Piotr Roszatycki E<lt>dexter@debian.orgE<gt>. The program was " -"rewritten in Perl by Julian Gilbey." +"* B<uscan> invokes the standard B<uupdate> as \"B<uupdate> B<--no-symlink --" +"upstream-version> I<version> B<../>I<spkg>B<_>I<version>B<.orig.tar.gz>\"." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1647 +msgid "Version 4" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1649 +msgid "" +"B<devscripts> version 2.15.10: The first incarnation of F<watch> files " +"supporting multiple upstream tarballs." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1652 +msgid "" +"The syntax of the watch file is relaxed to allow more spaces for readability." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1654 +msgid "" +"If you have a custom script in place of B<uupdate>, you may also encounter " +"problems updating from Version 3." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1659 +msgid "" +"* B<uscan> invokes the custom I<script> as \"I<script> B<--upstream-version> " +"I<version>\"." +msgstr "" + +#. type: =item +#: ../scripts/uscan.pl:1662 +msgid "" +"* B<uscan> invokes the standard B<uupdate> as \"B<uupdate> B<--find> B<--" +"upstream-version> I<version>\"." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1667 +msgid "" +"Restriction for B<--dehs> is lifted by redirecting other output to STDERR " +"when it is activated." +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1674 +msgid "dpkg(1), mk-origtargz(1), perlre(1), uupdate(1), devscripts.conf(5)" +msgstr "" + +#. type: textblock +#: ../scripts/uscan.pl:1678 +msgid "" +"The original version of uscan was written by Christoph Lameter " +"<clameter@debian.org>. Significant improvements, changes and bugfixes were " +"made by Julian Gilbey <jdg@debian.org>. HTTP support was added by Piotr " +"Roszatycki <dexter@debian.org>. The program was rewritten in Perl by Julian " +"Gilbey." msgstr "" #. type: TH @@ -15978,11 +18211,16 @@ #. type: Plain text #: ../scripts/uupdate.1:8 +msgid "B<uupdate> [I<options>] B<--find>|B<-f>" +msgstr "" + +#. type: Plain text +#: ../scripts/uupdate.1:10 msgid "B<uupdate> [I<options>] B<--patch>|B<-p> I<patch_file>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:20 +#: ../scripts/uupdate.1:22 msgid "" "B<uupdate> modifies an existing Debian source code archive to reflect an " "upstream update supplied as a patch or from a wholly new source code " @@ -15998,7 +18236,7 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:30 +#: ../scripts/uupdate.1:32 msgid "" "Currently supported source code file types are I<.tar.gz>, I<.tar.bz2>, " "I<.tar.Z>, I<.tgz>, I<.tar>, I<.tar.lzma>, I<.tar.xz>, I<.7z> and I<.zip> " @@ -16010,7 +18248,7 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:40 +#: ../scripts/uupdate.1:42 msgid "" "Usually B<uupdate> will be able to deduce the version number from the source " "archive name (as long as it only contains digits and periods). If that " @@ -16023,7 +18261,7 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:45 +#: ../scripts/uupdate.1:47 msgid "" "Since B<uupdate> uses B<debuild> to clean the current archive before trying " "to apply a patch file, it accepts a B<--rootcmd> or B<-r> option allowing " @@ -16032,7 +18270,7 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:52 +#: ../scripts/uupdate.1:54 msgid "" "If an archive is being built, the pristine upstream source should be used to " "create the I<.orig.tar.gz> file wherever possible. This means that MD5 sums " @@ -16042,42 +18280,48 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:54 +#: ../scripts/uupdate.1:56 msgid "This is a summary of what was explained above." msgstr "" #. type: TP -#: ../scripts/uupdate.1:54 +#: ../scripts/uupdate.1:60 #, no-wrap msgid "B<--upstream-version >I<version>, B<-v >I<version>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:57 +#: ../scripts/uupdate.1:63 msgid "Specify the version number of the upstream package explicitly." msgstr "" #. type: TP -#: ../scripts/uupdate.1:57 +#: ../scripts/uupdate.1:63 +#, no-wrap +msgid "B<--force-bad-version, -b >" +msgstr "" + +#. type: TP +#: ../scripts/uupdate.1:66 #, no-wrap msgid "B<--rootcmd >I<gain-root-command>, B<-r >I<gain-root-command>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:61 +#: ../scripts/uupdate.1:70 msgid "" "Specify the command to be used to become root to build the package and is " "passed onto B<debuild>(1) if it is specified." msgstr "" #. type: TP -#: ../scripts/uupdate.1:61 +#: ../scripts/uupdate.1:70 #, no-wrap msgid "B<--pristine>, B<-u>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:66 +#: ../scripts/uupdate.1:75 msgid "" "Treat the source as pristine upstream source and symlink to it from " "I<E<lt>packageE<gt>_E<lt>versionE<gt>.orig.tar.gz> whenever possible. This " @@ -16085,26 +18329,26 @@ msgstr "" #. type: TP -#: ../scripts/uupdate.1:66 +#: ../scripts/uupdate.1:75 #, no-wrap msgid "B<--no-pristine>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:69 +#: ../scripts/uupdate.1:78 msgid "" "Do not attempt to make a I<E<lt>packageE<gt>_E<lt>versionE<gt>.orig.tar.gz> " "symlink." msgstr "" #. type: TP -#: ../scripts/uupdate.1:69 +#: ../scripts/uupdate.1:78 #, no-wrap msgid "B<--symlink>, B<-s>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:74 +#: ../scripts/uupdate.1:83 msgid "" "Simply create a symlink when moving a new upstream I<.tar.gz> archive to the " "new I<E<lt>packageE<gt>_E<lt>versionE<gt>.orig.tar.gz> location. This is " @@ -16112,62 +18356,88 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:81 +#: ../scripts/uupdate.1:88 msgid "" -"Copy the upstream I<.tar.gz> to the new location instead of making a symlink." +"Copy the upstream I<.tar.gz> to the new location instead of making a " +"symlink, if I<E<lt>packageE<gt>_E<lt>versionE<gt>.orig.tar.gz> is missing. " +"Otherwise, do nothing." msgstr "" #. type: TP -#: ../scripts/uupdate.1:97 +#: ../scripts/uupdate.1:88 #, no-wrap -msgid "B<UUPDATE_PRISTINE>" +msgid "B<--find, -f>" +msgstr "" + +#. type: Plain text +#: ../scripts/uupdate.1:98 +msgid "" +"Find all upstream tarballs in I<../> which match " +"I<E<lt>pkgE<gt>_E<lt>versionE<gt>.orig.tar.{gz|bz2|lzma|xz}> or " +"I<E<lt>pkgE<gt>_E<lt>versionE<gt>.orig-" +"E<lt>componentE<gt>.tar.{gz|bz2|lzma|xz}> ; B<--upstream-version> required; " +"pristine source required; not valid for B<--patch>; This option uses B<dpkg-" +"source> as the backend to enable support for the multiple upstream tarballs " +"and to resolve minor bugs reported previously. The use of this option is " +"highly recommended." msgstr "" #. type: Plain text #: ../scripts/uupdate.1:101 +msgid "Give verbose output." +msgstr "" + +#. type: TP +#: ../scripts/uupdate.1:113 +#, no-wrap +msgid "B<UUPDATE_PRISTINE>" +msgstr "" + +#. type: Plain text +#: ../scripts/uupdate.1:117 msgid "" "If this is set to I<no>, then it is the same as the B<--no-pristine> command " "line parameter being used." msgstr "" #. type: TP -#: ../scripts/uupdate.1:101 +#: ../scripts/uupdate.1:117 #, no-wrap msgid "B<UUPDATE_SYMLINK_ORIG>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:105 +#: ../scripts/uupdate.1:121 msgid "" "If this is set to I<no>, then it is the same as the B<--no-symlink> command " "line parameter being used." msgstr "" #. type: TP -#: ../scripts/uupdate.1:105 +#: ../scripts/uupdate.1:121 #, no-wrap msgid "B<UUPDATE_ROOTCMD>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:108 +#: ../scripts/uupdate.1:124 msgid "This is equivalent to the B<--rootcmd> option." msgstr "" #. type: SH -#: ../scripts/uupdate.1:108 +#: ../scripts/uupdate.1:124 #, no-wrap msgid "ACTIONS TAKEN ON AN ARCHIVE" msgstr "" #. type: TP -#: ../scripts/uupdate.1:109 ../scripts/uupdate.1:142 +#: ../scripts/uupdate.1:125 ../scripts/uupdate.1:158 #, no-wrap msgid "B<Figure out new version number>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:115 +#: ../scripts/uupdate.1:131 msgid "" "Unless an explicit version number is provided, the archive name is analyzed " "for a sequence of digits separated by dots. If something like that is " @@ -16176,13 +18446,13 @@ msgstr "" #. type: TP -#: ../scripts/uupdate.1:115 +#: ../scripts/uupdate.1:131 #, no-wrap msgid "B<Create the .orig.tar.gz archive>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:120 +#: ../scripts/uupdate.1:136 msgid "" "If the B<--pristine> or B<-u> option is specified and the upstream archive " "is a I<.tar.gz> or I<.tgz> archive, then this will be copied directly to " @@ -16190,13 +18460,13 @@ msgstr "" #. type: TP -#: ../scripts/uupdate.1:120 +#: ../scripts/uupdate.1:136 #, no-wrap msgid "B<Unpacking>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:125 +#: ../scripts/uupdate.1:141 msgid "" "The archive is unpacked and placed in a directory with the correct name " "according to Debian policy: package-upstream_version.orig. Processing is " @@ -16204,13 +18474,13 @@ msgstr "" #. type: TP -#: ../scripts/uupdate.1:125 ../scripts/uupdate.1:153 +#: ../scripts/uupdate.1:141 ../scripts/uupdate.1:169 #, no-wrap msgid "B<Patching>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:133 +#: ../scripts/uupdate.1:149 msgid "" "The I<.diffs.gz> from the current version are applied to the unpackaged " "archive. A non-zero exit status and warning message will occur if the " @@ -16220,20 +18490,20 @@ msgstr "" #. type: TP -#: ../scripts/uupdate.1:133 ../scripts/uupdate.1:165 +#: ../scripts/uupdate.1:149 ../scripts/uupdate.1:181 #, no-wrap msgid "B<Changelog update>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:137 ../scripts/uupdate.1:169 +#: ../scripts/uupdate.1:153 ../scripts/uupdate.1:185 msgid "" "A changelog entry with the new version number is generated with the text " "``New upstream release''." msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:141 ../scripts/uupdate.1:173 +#: ../scripts/uupdate.1:157 ../scripts/uupdate.1:189 msgid "" "When used on Ubuntu systems, B<dpkg-vendor> detection is used to set the " "Debian revision to ``0ubuntu1''. You may change I<debian/changelog> " @@ -16241,13 +18511,13 @@ msgstr "" #. type: SH -#: ../scripts/uupdate.1:141 +#: ../scripts/uupdate.1:157 #, no-wrap msgid "ACTIONS TAKEN ON A PATCH FILE" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:148 +#: ../scripts/uupdate.1:164 msgid "" "Unless an explicit version number is provided, the patch file name is " "analyzed for a sequence of digits separated by dots. If something like that " @@ -16256,13 +18526,13 @@ msgstr "" #. type: TP -#: ../scripts/uupdate.1:148 +#: ../scripts/uupdate.1:164 #, no-wrap msgid "B<Clean the current source tree>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:153 +#: ../scripts/uupdate.1:169 msgid "" "The command B<debuild clean> is executed within the current Debian source " "archive to clean it. If a B<-r> option is given to B<uupdate>, it is passed " @@ -16270,7 +18540,7 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:165 +#: ../scripts/uupdate.1:181 msgid "" "The current source archive (I<.orig.tar.gz>) is unpacked and the patch " "applied to the original sources. If this is successful, then the I<.orig> " @@ -16284,17 +18554,17 @@ msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:178 +#: ../scripts/uupdate.1:194 msgid "B<debuild>(1), B<fakeroot>(1), B<patch>(1), B<devscripts.conf>(5)" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:180 +#: ../scripts/uupdate.1:196 msgid "B<The Debian Policy Manual>" msgstr "" #. type: Plain text -#: ../scripts/uupdate.1:183 +#: ../scripts/uupdate.1:199 msgid "" "The original version of B<uupdate> was written by Christoph Lameter " "E<lt>clameter@debian.orgE<gt>. Several changes and improvements have been " @@ -16437,9 +18707,9 @@ msgid "" "B<who-uploads> uses the Package Tracking System (PTS) to identify the " "uploaders of the three most recent versions of the given source packages. " -"Note that the uploaders are identified using their B<gpg>(1) keys; " -"installing a recent version of the I<debian-keyring> package should provide " -"most of the required keys." +"Note that the uploaders are identified using their B<gpg>(1) or B<gpg2>(1) " +"keys; installing a recent version of the I<debian-keyring> package should " +"provide most of the required keys." msgstr "" #. type: Plain text @@ -16559,19 +18829,19 @@ msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:44 +#: ../scripts/who-permits-upload.pl:45 msgid "who-permits-upload - look-up Debian Maintainer access control lists" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:48 +#: ../scripts/who-permits-upload.pl:49 msgid "" "B<who-permits-upload> [B<-h>] [B<-s> I<keyring>] [B<-d> I<dm_url>] [B<-s> " "I<search_type>] I<query> [I<query> ...]" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:52 +#: ../scripts/who-permits-upload.pl:53 msgid "" "B<who-permits-upload> looks up the given Debian Maintainer (DM) upload " "permissions from ftp-master.debian.org and parses them in a human readable " @@ -16580,12 +18850,12 @@ msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:60 +#: ../scripts/who-permits-upload.pl:61 msgid "B<--dmfile=>I<dm_url>, B<-d> I<dm_url>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:62 +#: ../scripts/who-permits-upload.pl:63 msgid "" "Retrieve the DM permission file from the supplied URL. When this option is " "not present, the default value I<https://ftp-master.debian.org/dm.txt> is " @@ -16593,17 +18863,17 @@ msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:67 +#: ../scripts/who-permits-upload.pl:68 msgid "Display an usage summary and exit." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:69 +#: ../scripts/who-permits-upload.pl:70 msgid "B<--keyring=>I<keyring>, B<-s> I<keyring>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:71 +#: ../scripts/who-permits-upload.pl:72 msgid "" "Use the supplied GnuPG keyrings to look-up GPG fingerprints from the DM " "permission file. When not present, the default Debian Developer and " @@ -16613,24 +18883,24 @@ msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:77 +#: ../scripts/who-permits-upload.pl:78 msgid "Separate keyrings with a colon \":\"." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:79 +#: ../scripts/who-permits-upload.pl:80 msgid "B<--search=>I<search_type>, B<-s> I<search_type>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:81 +#: ../scripts/who-permits-upload.pl:82 msgid "" "Modify the look-up behavior. This influences the interpretation of the " "I<query> argument. Supported search types are:" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:88 +#: ../scripts/who-permits-upload.pl:89 msgid "" "Search for a source package name. This is also the default when B<--search> " "is omitted. Since package names are unique, this will return given ACLs - " @@ -16638,41 +18908,41 @@ msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:92 +#: ../scripts/who-permits-upload.pl:93 msgid "B<uid>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:94 +#: ../scripts/who-permits-upload.pl:95 msgid "" "Search for a Debian Maintainer. This should be (a fraction of) a name. It " "will return all ACLs assigned to matching maintainers." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:97 +#: ../scripts/who-permits-upload.pl:98 msgid "B<sponsor>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:99 +#: ../scripts/who-permits-upload.pl:100 msgid "" "Search for a sponsor (i.e. a Debian Developer) who granted DM permissions. " "This will return all ACLs given by the supplied developer." msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:102 +#: ../scripts/who-permits-upload.pl:103 msgid "Note that this is an expensive operation which may take some time." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:106 +#: ../scripts/who-permits-upload.pl:107 msgid "I<query>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:108 +#: ../scripts/who-permits-upload.pl:109 msgid "" "A case sensitive argument to be looked up in the ACL permission file. The " "exact interpretation of this argument is dependent by the B<--search> " @@ -16680,79 +18950,79 @@ msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:111 +#: ../scripts/who-permits-upload.pl:112 msgid "This argument can be repeated." msgstr "" #. type: =head1 -#: ../scripts/who-permits-upload.pl:115 +#: ../scripts/who-permits-upload.pl:116 msgid "EXIT VALUE" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:121 +#: ../scripts/who-permits-upload.pl:122 msgid "Success" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:125 +#: ../scripts/who-permits-upload.pl:126 msgid "An error occurred" msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:127 +#: ../scripts/who-permits-upload.pl:128 msgid "2Z<>" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:129 +#: ../scripts/who-permits-upload.pl:130 msgid "The command line was not understood" msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:137 +#: ../scripts/who-permits-upload.pl:138 msgid "who-permits-upload --search=sponsor arno@debian.org" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:139 +#: ../scripts/who-permits-upload.pl:140 msgid "" "Search for all DM upload permissions given by the UID \"arno@debian.org\". " "Note, that only primary UIDs will match." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:142 +#: ../scripts/who-permits-upload.pl:143 msgid "who-permits-upload -s=sponsor \"Arno Töll\"" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:144 +#: ../scripts/who-permits-upload.pl:145 msgid "Same as above, but use a full name instead." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:146 +#: ../scripts/who-permits-upload.pl:147 msgid "who-permits-upload apache2" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:148 +#: ../scripts/who-permits-upload.pl:149 msgid "Look up who gave upload permissions for the apache2 source package." msgstr "" #. type: =item -#: ../scripts/who-permits-upload.pl:150 +#: ../scripts/who-permits-upload.pl:151 msgid "who-permits-upload --search=uid \"Paul Tagliamonte\"" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:152 +#: ../scripts/who-permits-upload.pl:153 msgid "Look up all DM upload permissions given to \"Paul Tagliamonte\"." msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:158 +#: ../scripts/who-permits-upload.pl:159 msgid "" "B<who-permits-upload> was written by Arno Töll <arno@debian.org> and is " "licensed under the terms of the General Public License (GPL) version 2 or " @@ -16760,12 +19030,12 @@ msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:163 -msgid "B<gpg>(1), B<who-uploads>(1)" +#: ../scripts/who-permits-upload.pl:164 +msgid "B<gpg>(1), B<gpg2>(1), B<who-uploads>(1)" msgstr "" #. type: textblock -#: ../scripts/who-permits-upload.pl:165 +#: ../scripts/who-permits-upload.pl:166 msgid "" "S<I<https://lists.debian.org/debian-devel-announce/2012/09/msg00008.html>>" msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/dselect.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/dselect.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/dselect.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/dselect.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:28+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:01+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: dselect/basecmds.cc msgid "Search for ? " diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ecryptfs-utils.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ecryptfs-utils.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ecryptfs-utils.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ecryptfs-utils.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:37+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:14+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. Name #: ../src/desktop/ecryptfs-record-passphrase:1 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/example-content.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/example-content.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/example-content.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/example-content.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:07+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:48+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/fcitx-qimpanel.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/fcitx-qimpanel.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/fcitx-qimpanel.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/fcitx-qimpanel.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:47+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 08:24+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: config-tool/editingskindialog.cpp:35 msgid "SkinInfo" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/fluid.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/fluid.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/fluid.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/fluid.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,1744 +0,0 @@ -# Burmese translation for fltk1.1 -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the fltk1.1 package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: fltk1.1\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-10-20 06:40+0000\n" -"PO-Revision-Date: 2013-05-27 13:20+0000\n" -"Last-Translator: Nyi Nyi Htwe <Unknown>\n" -"Language-Team: Burmese <my@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:37+0000\n" -"X-Generator: Launchpad (build 17958)\n" - -#: fluid.cxx:1573 -msgid "&File" -msgstr "& ဖိုင်" - -#: fluid.cxx:1574 -msgid "&New..." -msgstr "& အသစ်..." - -#: fluid.cxx:1575 -msgid "&Open..." -msgstr "& စဖွင့်သည်..." - -#: fluid.cxx:1576 -msgid "&Insert..." -msgstr "& ထည့်သွင်းသည်..." - -#: fluid.cxx:1578 -msgid "&Save" -msgstr "& သိမ်းဆည်းသည်" - -#: fluid.cxx:1579 -msgid "Save &As..." -msgstr "ကဲ့သို့သိမ်းဆည်းသည်..." - -#: fluid.cxx:1580 -msgid "Sa&ve A Copy..." -msgstr "ကူးယူမှ ုပုံစံကိုသိမ်းဆည်းသည်..." - -#: fluid.cxx:1581 -msgid "Save &Template..." -msgstr "ပုံစံနှင့်သိမ်းဆည်းသည်..." - -#: fluid.cxx:1582 -msgid "&Revert..." -msgstr "မူလအခြေအနေသို့ပြန်လည်ရောက်ရှိသည်..." - -#: fluid.cxx:1583 -msgid "&Print..." -msgstr "& ပုံနှိပ်သည်..." - -#: fluid.cxx:1584 -msgid "Write &Code..." -msgstr "ကုဒ်နှင့်ရေးသည်..." - -#: fluid.cxx:1585 -msgid "&Write Strings..." -msgstr "" - -#: fluid.cxx:1597 -msgid "&Quit" -msgstr "& ထွက်သည်" - -#: fluid.cxx:1599 -msgid "&Edit" -msgstr "& တည်းဖြတ်သည်" - -#: fluid.cxx:1600 -msgid "&Undo" -msgstr "& ပျက်ပြယ်စေသည် (သို့) ပြုပြင်သည်" - -#: fluid.cxx:1601 -msgid "&Redo" -msgstr "& တစ်ဖန်ပြန်ပြီးပြုလုပ်သည်" - -#: fluid.cxx:1602 -msgid "C&ut" -msgstr "& ဖြတ်တောက်သည်" - -#: fluid.cxx:1603 -msgid "&Copy" -msgstr "& ကူးယူသည်" - -#: fluid.cxx:1604 -msgid "&Paste" -msgstr "" - -#: fluid.cxx:1605 -msgid "Dup&licate" -msgstr "ပုံတူကူးသည်" - -#: fluid.cxx:1606 -msgid "&Delete" -msgstr "& ဖြတ်သည်" - -#: fluid.cxx:1607 -msgid "Select &All" -msgstr "" - -#: fluid.cxx:1608 -msgid "Select &None" -msgstr "" - -#: fluid.cxx:1609 -msgid "Pr&operties..." -msgstr "ပိုင်ဆိုင်မှ ု..." - -#: fluid.cxx:1610 -msgid "&Sort" -msgstr "& အစီအစဉ်တကျစီစဉ်သည်" - -#: fluid.cxx:1611 -msgid "&Earlier" -msgstr "& စောပြီး" - -#: fluid.cxx:1612 -msgid "&Later" -msgstr "& နောက်ကျပြီး" - -#: fluid.cxx:1613 -msgid "&Group" -msgstr "& အုပ်စုဖြတ်သိမ်းသည်" - -#: fluid.cxx:1614 -msgid "Ung&roup" -msgstr "အုပ်စုဖြတ်သိမ်းသည်" - -#: fluid.cxx:1615 -msgid "Hide O&verlays" -msgstr "ထပ်ဆင့်ထားခြင်းကိုဖုံးကွယ်သည်" - -#: fluid.cxx:1617 -msgid "Show Widget &Bin..." -msgstr "" - -#: fluid.cxx:1619 -msgid "Show Source Code..." -msgstr "Source ကုဒ်ပြသသည်..." - -#: fluid.cxx:1620 -msgid "Pro&ject Settings..." -msgstr "ပရောဂျက်ဆက်တင်များ..." - -#: fluid.cxx:1621 -msgid "GU&I Settings..." -msgstr "GUI ဆက်တင်များ..." - -#: fluid.cxx:1623 -msgid "&New" -msgstr "& အသစ်" - -#: fluid.cxx:1624 -msgid "&Layout" -msgstr "& အဆင်အပြင်" - -#: fluid.cxx:1625 -msgid "&Align" -msgstr "& ချိန်ညှိသည်" - -#: fluid.cxx:1626 -msgid "&Left" -msgstr "& ဘယ်ဘက်" - -#: fluid.cxx:1627 -msgid "&Center" -msgstr "& အလယ်ဗဟို" - -#: fluid.cxx:1628 -msgid "&Right" -msgstr "& ညာဘက်" - -#: fluid.cxx:1629 -msgid "&Top" -msgstr "& ထိပ်ဆုံး" - -#: fluid.cxx:1630 -msgid "&Middle" -msgstr "& အလယ်" - -#: fluid.cxx:1631 -msgid "&Bottom" -msgstr "& အောက်ခြေ" - -#: fluid.cxx:1633 -msgid "&Space Evenly" -msgstr "& ညီညီညာညာနေရာထပ်ထားသည်" - -#: fluid.cxx:1634 -msgid "&Across" -msgstr "& ဖြတ်ပြီး" - -#: fluid.cxx:1635 -msgid "&Down" -msgstr "& အောက်သို့" - -#: fluid.cxx:1637 -msgid "&Make Same Size" -msgstr "& ဆိုဒ်တူညီစွာပြုလုပ်သည်" - -#: fluid.cxx:1638 -msgid "&Width" -msgstr "& အကျယ်" - -#: fluid.cxx:1639 -msgid "&Height" -msgstr "& အမြင့်" - -#: fluid.cxx:1640 -msgid "&Both" -msgstr "& နှစ်ဘက်စလုံး" - -#: fluid.cxx:1642 -msgid "&Center In Group" -msgstr "& အုပ်စုထဲရှိအလယ်ဗဟိုတွင်" - -#: fluid.cxx:1643 -msgid "&Horizontal" -msgstr "& ရေပြင်ညီ" - -#: fluid.cxx:1644 -msgid "&Vertical" -msgstr "& ဒေါင်လိုက်" - -#: fluid.cxx:1646 -msgid "Set &Widget Size" -msgstr "" - -#: fluid.cxx:1647 -msgid "&Tiny" -msgstr "& အလွန်သေးငယ်သော" - -#: fluid.cxx:1648 -msgid "&Small" -msgstr "& သေးငယ်သော" - -#: fluid.cxx:1649 -msgid "&Normal" -msgstr "& ပုံမှန်အတိုင်း" - -#: fluid.cxx:1650 -msgid "&Medium" -msgstr "& အလယ်အလတ်" - -#: fluid.cxx:1651 -msgid "&Large" -msgstr "& ကြီးမားသော" - -#: fluid.cxx:1652 -msgid "&Huge" -msgstr "& အလွန်ကြီးမားသော" - -#: fluid.cxx:1654 -msgid "&Grid and Size Settings..." -msgstr "& ပုံစံနှင့်အရွယ်အစားဆက်တင်များ..." - -#: fluid.cxx:1656 -msgid "&Shell" -msgstr "& Shell" - -#: fluid.cxx:1657 -msgid "Execute &Command..." -msgstr "" - -#: fluid.cxx:1658 -msgid "Execute &Again..." -msgstr "" - -#: fluid.cxx:1660 -msgid "&Help" -msgstr "& အကူအညီ" - -#: fluid.cxx:1661 -msgid "&About FLUID..." -msgstr "& ပြောင်းလဲနိုင်သောအခြေအနေအကြောင်း ..." - -#: fluid.cxx:1662 -msgid "&On FLUID..." -msgstr "& ပြောင်းလဲနိုင်သောအခြေအနေအပေါ်..." - -#: fluid.cxx:1663 -msgid "&Manual..." -msgstr "& ညွန်ကြားချက်စာအုပ်..." - -#: fluid.cxx:1764 -msgid "Double-click to view or change an item." -msgstr "ကြည့်ရှူ့ရန်ကလစ်နှစ်ချက်နှိပ်ပါ။ (သို့မဟုတ်) အချက်ကိုပြောင်းပါ။" - -#: fluid.cxx:2178 -#, c-format -msgid "" -"usage: %s <switches> name.fl\n" -" -c : write .cxx and .h and exit\n" -" -cs : write .cxx and .h and strings and exit\n" -" -o <name> : .cxx output filename, or extension if <name> starts with '.'\n" -" -h <name> : .h output filename, or extension if <name> starts with '.'\n" -"%s\n" -msgstr "" -"အသုံး %s <switches> အမည်.fl\n" -"-c : .ccx နှင့် .h ကိုရေးပြီးထွက်ပါ\n" -"-cs: .ccx, .h နှင့်strings ကိုရေးပြီးထွက်ပါ\n" -"-o <အမည်> : .ccx အတွက်ဖိုင်အမည်, (သို့) ‘-‘ နှင့် <အမည်> စလျှင်တိုးချဲမှ ု \n" -"-h<အမည်>: .h အတွက်ဖိုင်အမည်, (သို့) ‘-‘ နှင့် <အမည်> စလျှင်တိုးချဲမှ\n" -"%s\n" - -#: about_panel.cxx:276 -msgid "About FLUID" -msgstr "ပြောင်းလဲနိုင်သောအခြေအနေအကြောင်း" - -#: about_panel.cxx:283 -msgid "" -"FLTK User\n" -"Interface Designer\n" -"Version 1.1.9" -msgstr "" -"FLTK အသုံးပြုသူ\n" -"အပြင်အဆင်ပုံစံဒီဇိုင်းဆွဲဲသူ\n" -"မူကွဲ 1.1.9" - -#: about_panel.cxx:290 -msgid "" -"Copyright 1998-2008 by\n" -"Bill Spitzak and others" -msgstr "" -"မူပိုင္ခြင့္ 1998-2008 မွ\n" -"Bill Spitzak ႏွင့္အၿခားသူတို ့" - -#: about_panel.cxx:293 -msgid "View License..." -msgstr "တရားဝင်ခွင့်ပြုချက်ကိုပြသသည်..." - -#: about_panel.cxx:297 widget_panel.cxx:771 function_panel.cxx:964 -#: alignment_panel.cxx:67 alignment_panel.cxx:271 alignment_panel.cxx:378 -#: alignment_panel.cxx:433 -msgid "Close" -msgstr "ပိတ်သည်" - -#: widget_panel.cxx:47 function_panel.cxx:45 function_panel.cxx:335 -msgid "private" -msgstr "သီးသန့်" - -#: widget_panel.cxx:48 function_panel.cxx:46 function_panel.cxx:271 -#: function_panel.cxx:336 function_panel.cxx:416 -msgid "public" -msgstr "အများနှင့်သက်ဆိုင်သော" - -#: widget_panel.cxx:49 function_panel.cxx:47 function_panel.cxx:337 -msgid "protected" -msgstr "ကာကွယ်ခဲ့သည်" - -#: widget_panel.cxx:54 function_panel.cxx:54 -msgid "local" -msgstr "နယ်ပယ်တစ်ခုနှင့်ဆိုင်သော" - -#: widget_panel.cxx:55 function_panel.cxx:55 -msgid "global" -msgstr "ကမ္ဘာအနှံ့" - -#: widget_panel.cxx:76 -msgid "GUI" -msgstr "GUI" - -#: widget_panel.cxx:81 -msgid "Label:" -msgstr "အညွန်း" - -#: widget_panel.cxx:87 -msgid "The label text for the widget." -msgstr "widget အတြက္အညြန္းစာ" - -#: widget_panel.cxx:96 -msgid "The label style for the widget." -msgstr "widget အတွက်အညွန်းပုံစံ။" - -#: widget_panel.cxx:107 -msgid "Image:" -msgstr "ပုံရိပ်" - -#: widget_panel.cxx:113 -msgid "The active image for the widget." -msgstr "Widget အတွက်ပုံရိပ်ကောင်း။" - -#: widget_panel.cxx:120 widget_panel.cxx:140 -msgid "Browse..." -msgstr "ရှာဖွေရန်..." - -#: widget_panel.cxx:121 -msgid "Click to choose the active image." -msgstr "ပုံရိပ်ကောင်းကိုကြည့်ရှူ့ ရန်ကလစ်နှိပ်ပါ။" - -#: widget_panel.cxx:127 -msgid "Inactive:" -msgstr "မသက်ရောက်သော" - -#: widget_panel.cxx:133 -msgid "The inactive image for the widget." -msgstr "Widget အတွက်မသင့်လျော်သောပုံရိပ်။" - -#: widget_panel.cxx:141 -msgid "Click to choose the inactive image." -msgstr "မသင့်လျော်သောပုံရိပ်ကိုရွေးချယ်ရန်ကလစ်နှိပ်ပါ။" - -#: widget_panel.cxx:147 -msgid "Alignment:" -msgstr "ပေါင်းစည်းမှ ု (သို့မဟုတ်) ဖြောင့်တန်းမှ ု" - -#: widget_panel.cxx:152 -msgid "Clip" -msgstr "ဖြတ်သည်။ / ညှပ်သည်" - -#: widget_panel.cxx:153 -msgid "Clip the label to the inside of the widget." -msgstr "Widget ၏အတွင်းဖက်သို့အညွန်းကိုဖြတ်ပါ။" - -#: widget_panel.cxx:160 -msgid "Wrap" -msgstr "ထုတ်ပိုးသည်" - -#: widget_panel.cxx:161 -msgid "Wrap the label text." -msgstr "အညွန်းစာကိုထုတ်ပိုးသည်။" - -#: widget_panel.cxx:167 -msgid "Text/Image" -msgstr "စာ/ပုံရိပ်" - -#: widget_panel.cxx:168 -msgid "Show the label text over the image." -msgstr "ပုံရိပ်ပေါ်မှ အညွန်းစာကိုပြသပါ။" - -#: widget_panel.cxx:174 -msgid "@-1<-" -msgstr "@-1<-" - -#: widget_panel.cxx:175 -msgid "Left-align the label." -msgstr "အညွန်းကိုဘယ်ဘက်သို့ချိန်ညှိပါ။" - -#: widget_panel.cxx:182 -msgid "@-1->" -msgstr "@-1->" - -#: widget_panel.cxx:183 -msgid "Right-align the label." -msgstr "အညွန်းကိုညာဘက်သို့ချိန်ညှိပါ။" - -#: widget_panel.cxx:190 -msgid "@-18" -msgstr "@-18" - -#: widget_panel.cxx:191 -msgid "Top-align the label." -msgstr "အညွန်းကိုအပေါ်သို့ချိန်ညှိပါ။" - -#: widget_panel.cxx:198 -msgid "@-12" -msgstr "@-12" - -#: widget_panel.cxx:199 -msgid "Bottom-align the label." -msgstr "အညွန်းကိုအောက်ခြေသို့ချိန်ညှိပါ။" - -#: widget_panel.cxx:206 -msgid "@-3square" -msgstr "@-3square" - -#: widget_panel.cxx:207 -msgid "Show the label inside the widget." -msgstr "Widget အတွင်းရှိအညွန်းကိုပြသပါ။" - -#: widget_panel.cxx:220 -msgid "Position:" -msgstr "နေရာ" - -#: widget_panel.cxx:225 -msgid "X:" -msgstr "X:" - -#: widget_panel.cxx:226 -msgid "The X position of the widget." -msgstr "Widget ၏ X နေရာ" - -#: widget_panel.cxx:234 -msgid "Y:" -msgstr "Y:" - -#: widget_panel.cxx:235 -msgid "The Y position of the widget." -msgstr "Widget ၏ Y နေရာ" - -#: widget_panel.cxx:243 -msgid "Width:" -msgstr "အကျယ်" - -#: widget_panel.cxx:244 -msgid "The width of the widget." -msgstr "Widget ၏ Y နေရာ" - -#: widget_panel.cxx:252 -msgid "Height:" -msgstr "အမြင့်" - -#: widget_panel.cxx:253 -msgid "The height of the widget." -msgstr "Widget ၏ အမြင့်" - -#: widget_panel.cxx:261 -msgid "Relative" -msgstr "ဆက်စပ်လျှက်ရှိသော" - -#: widget_panel.cxx:262 -msgid "" -"If set, widgets inside a widget class of type Fl_Group are repositioned " -"relative to the origin at construction time" -msgstr "" -"သတ်မှတ်ခဲ့လျှင်အတွင်းရှိ widget သတ်မှတ်ချက်၏အမျိုးအစားတစ်ခုဖြစ်သော F1 ___ " -"အုပ်စုသည် မူလပုံစံအားတည်ဆောက်ချိန်တွင်သိမ်းဆည်းမည်ဖြစ်သည်" - -#: widget_panel.cxx:272 -msgid "Values:" -msgstr "တန်ဖိုး -" - -#: widget_panel.cxx:277 -msgid "Size:" -msgstr "အရွယ်အစား -" - -#: widget_panel.cxx:278 widget_panel.cxx:326 -msgid "The size of the slider." -msgstr "slider ၏အရွယ်အစား။" - -#: widget_panel.cxx:285 -msgid "Minimum:" -msgstr "အနည်းဆုံး -" - -#: widget_panel.cxx:286 widget_panel.cxx:335 -msgid "The minimum value of the widget." -msgstr "Widget ၏အနည်းဆုံးတန်ဖိုး။" - -#: widget_panel.cxx:292 -msgid "Maximum:" -msgstr "အများဆုံး -" - -#: widget_panel.cxx:293 widget_panel.cxx:348 -msgid "The maximum value of the widget." -msgstr "Widget ၏အများဆုံးတန်ဖိုး။" - -#: widget_panel.cxx:300 -msgid "Step:" -msgstr "တက်လှမ်းသည် -" - -#: widget_panel.cxx:301 widget_panel.cxx:357 -msgid "The resolution of the widget value." -msgstr "Widget တန်ဖိုး၏ဆုံးဖြတ်ချက်။" - -#: widget_panel.cxx:307 -msgid "Value:" -msgstr "တန်ဖိုး -" - -#: widget_panel.cxx:308 -msgid "The current widget value." -msgstr "Widget ၏လက်ရှိတန်ဖိုး။" - -#: widget_panel.cxx:319 -msgid "Size Range:" -msgstr "အရွယ်အစားအပိုင်းအခြား -" - -#: widget_panel.cxx:325 -msgid "Minimum Size:" -msgstr "အနည်းဆုံးအရွယ်အစား -" - -#: widget_panel.cxx:343 widget_panel.cxx:365 -msgid "set" -msgstr "သတ်မှတ်သည်" - -#: widget_panel.cxx:347 -msgid "Maximum Size:" -msgstr "အများဆုံးအရွယ်အစား -" - -#: widget_panel.cxx:374 -msgid "Shortcut:" -msgstr "အတိုကောက် -" - -#: widget_panel.cxx:375 -msgid "The shortcut key for the widget." -msgstr "Widget အတွက် shortcut ခလုတ်။" - -#: widget_panel.cxx:387 -msgid "X Class:" -msgstr "X သတ်မှတ်ချက် -" - -#: widget_panel.cxx:392 -msgid ":" -msgstr ":" - -#: widget_panel.cxx:393 -msgid "The X resource class." -msgstr "X အရင်းမြစ်သတ်မှတ်ချက်။" - -#: widget_panel.cxx:400 -msgid "Border" -msgstr "နယ်နိမိတ်" - -#: widget_panel.cxx:401 -msgid "Add a border around the window." -msgstr "Window အနီးအနားတွင်နယ်နိမိတ်အပိုင်းအခြားတစ်ခု ထည့်သည်။" - -#: widget_panel.cxx:406 -msgid "Modal" -msgstr "ဖြစ်နိုင်ခြေရှိခြင်း ၊ ခွင့်ပြုခြင်း ၊ နည်းလမ်း" - -#: widget_panel.cxx:407 -msgid "Make the window modal." -msgstr "Window နည်းလမ်းများပြုလုပ်သည်။" - -#: widget_panel.cxx:412 -msgid "Nonmodal" -msgstr "နည်းလမ်းမရှိ" - -#: widget_panel.cxx:413 -msgid "Make the window non-modal." -msgstr "Window အတွက်သတ်မှတ်သောနည်းလမ်းမရှိအောင်လုပ်သည်။" - -#: widget_panel.cxx:421 -msgid "Attributes:" -msgstr "မှတ်ယူသည်။" - -#: widget_panel.cxx:426 -msgid "Visible" -msgstr "မြင်နိုင်သော" - -#: widget_panel.cxx:427 -msgid "Show the widget." -msgstr "Widget ကိုပြသသည်။" - -#: widget_panel.cxx:432 -msgid "Active" -msgstr "သက်ရောက်သော" - -#: widget_panel.cxx:433 -msgid "Activate the widget." -msgstr "Widget ကိုအသုံးပြုနိုင်အောင်လုပ်သည်။" - -#: widget_panel.cxx:438 -msgid "Resizable" -msgstr "အရွယ်အစားပြန်လည်သတ်မှတ်နိုင်သော" - -#: widget_panel.cxx:439 -msgid "Make the widget resizable." -msgstr "Widget ကိုအရွယ်အစားသတ်မှတ်နိုင်အောင်လုပ်သည်။" - -#: widget_panel.cxx:445 -msgid "Hotspot" -msgstr "Hotspot" - -#: widget_panel.cxx:446 -msgid "Center the window under this widget." -msgstr "ဒီ widget အောက်တွင် window ကိုအလယ်တွင်ထားပါ။" - -#: widget_panel.cxx:458 -msgid "Tooltip:" -msgstr "Tooltip" - -#: widget_panel.cxx:459 -msgid "The tooltip text for the widget." -msgstr "Widget အတွက် tooltip။" - -#: widget_panel.cxx:472 -msgid "Style" -msgstr "ပုံစံ" - -#: widget_panel.cxx:477 -msgid "Label Font:" -msgstr "လေဘယ်လ်စာပုံစံ -" - -#: widget_panel.cxx:483 -msgid "The style of the label text." -msgstr "လေဘယ်လ်စာ၏ပုံစံ။" - -#: widget_panel.cxx:494 -msgid "The size of the label text." -msgstr "လေဘယ်လ်စာ၏အရွယ်အစား။" - -#: widget_panel.cxx:502 -msgid "Label Color" -msgstr "လေဘယ်လ်အရောင်" - -#: widget_panel.cxx:503 -msgid "The color of the label text." -msgstr "လေဘယ်လ်စာ၏အရောင်။" - -#: widget_panel.cxx:509 -msgid "Box:" -msgstr "သေတ္တာ -" - -#: widget_panel.cxx:515 -msgid "The \"up\" box of the widget." -msgstr "Widget ၏ ‘up’ သေတ္တာ။" - -#: widget_panel.cxx:525 -msgid "Color" -msgstr "အရောင်" - -#: widget_panel.cxx:526 -msgid "The background color of the widget." -msgstr "Widget ၏နောက်ခံအရောင်။" - -#: widget_panel.cxx:532 -msgid "Down Box:" -msgstr "Down သေတ္တာ -" - -#: widget_panel.cxx:538 -msgid "The \"down\" box of the widget." -msgstr "Widget ၏ “down” သေတ္တာ။" - -#: widget_panel.cxx:548 -msgid "Select Color" -msgstr "အရောင်ရွေးပါ" - -#: widget_panel.cxx:549 -msgid "The selection color of the widget." -msgstr "Widget ၏အရောင်ရွေးချယ်မှ ု။" - -#: widget_panel.cxx:555 -msgid "Text Font:" -msgstr "စာသားပုံစံ" - -#: widget_panel.cxx:561 -msgid "The value text style." -msgstr "" - -#: widget_panel.cxx:572 -msgid "The value text size." -msgstr "" - -#: widget_panel.cxx:580 -msgid "Text Color" -msgstr "စာသား အရောင်" - -#: widget_panel.cxx:581 -msgid "The value text color." -msgstr "" - -#: widget_panel.cxx:593 -msgid "C++" -msgstr "C++" - -#: widget_panel.cxx:597 -msgid "Class:" -msgstr "အတန်း -" - -#: widget_panel.cxx:603 -msgid "The widget subclass." -msgstr "Widget ၏အတန္းခြဲ။" - -#: widget_panel.cxx:612 -msgid "The widget subtype." -msgstr "Widget ၏အမျိုးအစားခွဲ။" - -#: widget_panel.cxx:621 function_panel.cxx:427 -msgid "Name:" -msgstr "အမည် -" - -#: widget_panel.cxx:627 -msgid "The name of the widget." -msgstr "Widget ၏အမည်" - -#: widget_panel.cxx:635 function_panel.cxx:73 -msgid "Change member access attribute." -msgstr "" -"အဖွဲ့ဝင်များဝင်ရောက်အသုံးပြုထားသောလမ်းကြောင်းမှတ်ယူမှ ုများကိုပြောင်းလဲသည်။" - -#: widget_panel.cxx:644 function_panel.cxx:81 function_panel.cxx:264 -msgid "Change widget accessibility." -msgstr "Widget ၏လမ်းကြောင်းကိုပြောင်းလဲသည်။" - -#: widget_panel.cxx:654 -msgid "Extra Code:" -msgstr "အပိုကုဒ် -" - -#: widget_panel.cxx:655 widget_panel.cxx:663 widget_panel.cxx:670 -#: widget_panel.cxx:677 -msgid "Extra initialization code for the widget." -msgstr "Widget အတွက်အပိုသတ်မှတ်ထားသောကုဒ်။" - -#: widget_panel.cxx:683 -msgid "Callback:" -msgstr "ပြန်ပြီးခေါ်သည် -" - -#: widget_panel.cxx:684 -msgid "" -"The callback function or code for the widget. Use the variable name 'o' to " -"access the Widget pointer and 'v' to access the user value." -msgstr "" -"ပြန်လည်ခေါ်ဆိုမှ ုအခြေခံလုပ်ငန်း (သို့) wiget အတွက်ကုဒ်။Widget pointer " -"လမ်းကြောင်းကိုဝင်ရောက်နိုင်ရန်အမည် ‘o’ ကိုအသုံးပြုပါ။ " -"အသုံးပြုသူလမ်းကြောင်းကိုဝင်ရောက်နိုင်ရန် ‘v’ ကိုသုံးပါ။" - -#: widget_panel.cxx:700 -msgid "User Data:" -msgstr "အသုံးပြုသူ၏အချက်အလက် -" - -#: widget_panel.cxx:706 -msgid "The user data to pass into the callback code." -msgstr "" -"အသုံးပြုသူ၏အချက်အလက်ကိုပြန်လည်ခေါ်ဆိုမှ ုကုဒ်သို့ဖြတ်သန်းသွားလာခွင့်ပြုသည်။" - -#: widget_panel.cxx:714 -msgid "When:" -msgstr "မည်သည့်အချိန် -" - -#: widget_panel.cxx:715 -msgid "When to call the callback function." -msgstr "" - -#: widget_panel.cxx:727 -msgid "Type:" -msgstr "အမျိုးအစား" - -#: widget_panel.cxx:733 -msgid "The type of the user data." -msgstr "အသုံးပြုသူ၏အချက်အလက်အမျိုးအစား" - -#: widget_panel.cxx:741 -msgid "No Change" -msgstr "ပြောင်းလဲမှ ုမရှိ" - -#: widget_panel.cxx:742 -msgid "Call the callback even if the value has not changed." -msgstr "အကယ်၍တန်းဖိုးမပြောင်းလဲလျှင်တောင် call back ကိုခေါ်မည်။" - -#: widget_panel.cxx:760 -msgid "Hide &Overlays" -msgstr "" - -#: widget_panel.cxx:761 -msgid "Hide the widget overlay box." -msgstr "Widget ၏ overlay box ကိုဖျောက်သည်။" - -#: widget_panel.cxx:766 -msgid "Revert" -msgstr "နဂိုအခြေအနေသို့ပြန်ပြောင်းသည်။" - -#: widget_panel.cxx:775 function_panel.cxx:122 function_panel.cxx:171 -#: function_panel.cxx:223 function_panel.cxx:304 function_panel.cxx:384 -#: function_panel.cxx:451 function_panel.cxx:507 alignment_panel.cxx:365 -#: print_panel.cxx:442 print_panel.cxx:503 template_panel.cxx:181 -msgid "Cancel" -msgstr "ပယ်ဖျက်သည်" - -#: widget_panel.cxx:780 -msgid "Live &Mode" -msgstr "Live နှင့်နည်းလမ်း" - -#: widget_panel.cxx:781 -msgid "" -"Create a live duplicate of the selected widgets to test resizing and menu " -"behavior." -msgstr "" - -#: function_panel.cxx:70 -msgid "Function/Method Properties" -msgstr "လုပ်ငန်း/နည်းလမ်း လက္ခဏာများ" - -#: function_panel.cxx:88 -msgid "C declaration" -msgstr "C ကြော်ငြာချက်" - -#: function_panel.cxx:89 -msgid "Declare with a C interface instead of C++." -msgstr "C++ အစား C interface နှင့်ကြော်ငြာပါ။" - -#: function_panel.cxx:97 -msgid "Name(args): (blank for main())" -msgstr "အမည်(args) : (black for mdin())" - -#: function_panel.cxx:98 -msgid "The name of the function or method." -msgstr "လုပ်ငန်း သို့မဟုတ် နည်းလမ်း၏အမည်" - -#: function_panel.cxx:107 -msgid "Return Type: (blank to return outermost widget)" -msgstr "" - -#: function_panel.cxx:108 -msgid "The return type of the function or method." -msgstr "" - -#: function_panel.cxx:117 function_panel.cxx:167 function_panel.cxx:219 -#: function_panel.cxx:300 function_panel.cxx:380 function_panel.cxx:447 -#: function_panel.cxx:503 -msgid "OK" -msgstr "OK" - -#: function_panel.cxx:118 -msgid "Apply the changes." -msgstr "ပြောင်းလဲမှ ုများကိုအကျိုးသက်ရောက်စေသည်" - -#: function_panel.cxx:123 -msgid "Cancel the changes." -msgstr "ပြောင်းလဲမှ ုအစီအစဉ်ကိုဖျက်သည်။" - -#: function_panel.cxx:148 -msgid "Code Properties" -msgstr "ကုဒ်များ၏လက္ခဏာ" - -#: function_panel.cxx:199 -msgid "Code Block Properties" -msgstr "ကုဒ်ဘလော့၏လက္ခဏာများ" - -#: function_panel.cxx:201 -msgid "Conditional code block" -msgstr "" - -#: function_panel.cxx:202 -msgid "#ifdef or similar conditional code block." -msgstr "#ifdef သို့မဟုတ် ပုံစုံတူအခြေအနေပြကုဒ်ဘလော့" - -#: function_panel.cxx:209 -msgid "\"{...child code...}\" is inserted here" -msgstr "“{---- child code---}” ကို ဤနေရာတွင်အစားထိုးပါ။" - -#: function_panel.cxx:210 -msgid "#endif or similar conditional code block." -msgstr "#endif (သို့)ပုံစံတူအခြေအနေပြကုဒ်ဘလော့" - -#: function_panel.cxx:244 -msgid "in source code only" -msgstr "Source ကုဒ်တစ်ခုထဲတွင်သာ" - -#: function_panel.cxx:245 -msgid "in header and source" -msgstr "Header နှင့် source အတွင်" - -#: function_panel.cxx:260 -msgid "Declaration Block Properties" -msgstr "ကြေငြာချက်ဘလော့၏လက္ခဏာများ" - -#: function_panel.cxx:272 -msgid "Make the declaration publicly accessible." -msgstr "" - -#: function_panel.cxx:283 -msgid "#ifdef or similar conditional declaration block." -msgstr "#ifdef (သို့) ပုံစံတူအခြေအနေပြကြော်ငြာချက်ဘလော့။" - -#: function_panel.cxx:291 -msgid "\"\\n...child code...\\n\" is inserted here" -msgstr "“\\n--- child code ---\\n “ ကို ဤနေရာတွင်အစားထိုးပါ" - -#: function_panel.cxx:292 -msgid "#endif or similar declaration code block." -msgstr "#endif (သို့မဟုတ်)ပုံစံတူကြေငြာချက် ကုဒ် block" - -#: function_panel.cxx:325 -msgid "in source file only" -msgstr "မူရင်းဖိုင်တစ်မျိုးတည်းတွင်သာ" - -#: function_panel.cxx:326 -msgid "in header file only" -msgstr "ခေါင်းစီးဖိုင်အတွင်းတွင်သာ" - -#: function_panel.cxx:327 -msgid "\"static\" in source file" -msgstr "မူရင်းဖိုင်ရှိ “static”" - -#: function_panel.cxx:328 -msgid "in source and \"extern\" in header" -msgstr "မူရင်းနှင့် header တွင်းရှိ “extem” ထဲတွင်သာ" - -#: function_panel.cxx:348 -msgid "Declaration Properties" -msgstr "ကြောငြာချက်၏လက္ခဏာများ" - -#: function_panel.cxx:368 -msgid "" -"Can be any declaration, like \"int x;\", an external symbol like \"extern " -"int foo();\", a #directive like \"#include <foo.h>\", a comment like " -"\"//foo\" or \"/*foo*/\", or typedef like \"typedef char byte;\" or \"using " -"std::list;\"." -msgstr "" - -#: function_panel.cxx:371 -msgid "Declaration text." -msgstr "ကြေငြာချက်စာသား" - -#: function_panel.cxx:412 -msgid "Class Properties" -msgstr "Class ၏လက္ခဏာ" - -#: function_panel.cxx:417 -msgid "Make the class publicly accessible." -msgstr "Class ကိုလူတိုင်းအသုံးပြုနိုင်အောင်ပြုလုပ်သည်။" - -#: function_panel.cxx:428 -msgid "Name of class." -msgstr "Class ၏အမည်" - -#: function_panel.cxx:437 -msgid "Subclass of (text between : and {)" -msgstr "(text between : and {) ၏ class ခွဲ" - -#: function_panel.cxx:438 -msgid "Name of subclass." -msgstr "Class ခွဲ၏အမည်" - -#: function_panel.cxx:484 -msgid "Comment Properties" -msgstr "ထင်မြင်ချက်၏လက္ခဏာ" - -#: function_panel.cxx:519 -msgid "In Source" -msgstr "မူရင်းတွင်သာ" - -#: function_panel.cxx:520 -msgid "Put the comment into the source (.cxx) file." -msgstr "မူရင်း (.ccx) ဖိုင်အတွင်းသို့comment ကိုထည့်သွင်းသည်။" - -#: function_panel.cxx:524 -msgid "In Header" -msgstr "ခေါင်းစီးတွင်သာ" - -#: function_panel.cxx:525 -msgid "Put the comment into the header (.h) file." -msgstr "ခေါင်းစီး (.h) ဖိုင်ထဲသို့comment ကိုထည့်သွင်းသည်။" - -#: function_panel.cxx:529 -msgid "Predefined" -msgstr "ကြိုတင်အဓိပ္ပါယ်သတ်မှတ်သည်" - -#: function_panel.cxx:533 -msgid "Import..." -msgstr "Import..." - -#: function_panel.cxx:565 -msgid "Widget Bin" -msgstr "Widget များစွန့်ပစ်ရန်နေရာ" - -#: function_panel.cxx:569 -msgid "Function" -msgstr "လုပ်ငန်း" - -#: function_panel.cxx:575 factory.cxx:957 -msgid "Class" -msgstr "Class" - -#: function_panel.cxx:581 factory.cxx:959 -msgid "Comment" -msgstr "ထင်မြင်ချက်" - -#: function_panel.cxx:587 factory.cxx:951 factory.cxx:953 -msgid "Code" -msgstr "ကုဒ်" - -#: function_panel.cxx:593 factory.cxx:954 -msgid "Code Block" -msgstr "ကုဒ်ဘလော့" - -#: function_panel.cxx:599 factory.cxx:958 -msgid "Widget Class" -msgstr "Widget Class" - -#: function_panel.cxx:605 factory.cxx:955 -msgid "Declaration" -msgstr "" - -#: function_panel.cxx:611 factory.cxx:956 -msgid "Declaration Block" -msgstr "" - -#: function_panel.cxx:620 -msgid "Window" -msgstr "" - -#: function_panel.cxx:626 factory.cxx:961 -msgid "Group" -msgstr "" - -#: function_panel.cxx:632 -msgid "Pack" -msgstr "" - -#: function_panel.cxx:638 -msgid "Tabs" -msgstr "" - -#: function_panel.cxx:644 -msgid "Scroll" -msgstr "" - -#: function_panel.cxx:650 -msgid "Tile" -msgstr "" - -#: function_panel.cxx:656 -msgid "Wizard" -msgstr "" - -#: function_panel.cxx:665 -msgid "Button" -msgstr "" - -#: function_panel.cxx:671 -msgid "Return Button" -msgstr "ပြန်လာရန်အတွက်ခလုတ်" - -#: function_panel.cxx:677 -msgid "Light Button" -msgstr "" - -#: function_panel.cxx:683 -msgid "Repeat Button" -msgstr "ပန်လုပ်ရန်အတွက်ခလုတ်" - -#: function_panel.cxx:689 -msgid "Check Button" -msgstr "စစ်ဆေးရန်အတွက်ခလုတ်" - -#: function_panel.cxx:695 -msgid "Round Button" -msgstr "" - -#: function_panel.cxx:704 -msgid "Slider" -msgstr "Slider" - -#: function_panel.cxx:710 -msgid "Scroll Bar" -msgstr "Scroll Bar" - -#: function_panel.cxx:716 -msgid "Value Slider" -msgstr "Value Slider" - -#: function_panel.cxx:722 -msgid "Value Output" -msgstr "Value Output" - -#: function_panel.cxx:728 -msgid "Adjuster" -msgstr "Adjuster" - -#: function_panel.cxx:734 -msgid "Counter" -msgstr "Counter" - -#: function_panel.cxx:740 -msgid "Dial" -msgstr "Dial" - -#: function_panel.cxx:746 -msgid "Roller" -msgstr "Roller" - -#: function_panel.cxx:752 -msgid "Spinner" -msgstr "Spinner" - -#: function_panel.cxx:758 -msgid "Value Input" -msgstr "Value Input" - -#: function_panel.cxx:767 -msgid "Input" -msgstr "Input" - -#: function_panel.cxx:773 alignment_panel.cxx:75 -msgid "Output" -msgstr "Output" - -#: function_panel.cxx:779 -msgid "Text Edit" -msgstr "စာကိုတည်းဖြတ်ရန်" - -#: function_panel.cxx:785 -msgid "Text Display" -msgstr "စာကိုပြသရန်" - -#: function_panel.cxx:791 -msgid "File Input" -msgstr "ဖိုင် Input" - -#: function_panel.cxx:800 -msgid "Menu Bar" -msgstr "မီႏူးဘား" - -#: function_panel.cxx:806 -msgid "Input Choice" -msgstr "Input Choice" - -#: function_panel.cxx:812 -msgid "Menu Button" -msgstr "မီနူးခလုတ်" - -#: function_panel.cxx:818 -msgid "Menu Item" -msgstr "မီနူးအချက်" - -#: function_panel.cxx:824 -msgid "Choice" -msgstr "ရွေးချယ်ရန်" - -#: function_panel.cxx:830 -msgid "Sub Menu" -msgstr "မီနူးခွဲ" - -#: function_panel.cxx:839 -msgid "Browser" -msgstr "Browser" - -#: function_panel.cxx:845 -msgid "Check Browser" -msgstr "Browserကိုစစ်ဆေးရန်" - -#: function_panel.cxx:851 -msgid "File Browser" -msgstr "browser ဖိုင်" - -#: function_panel.cxx:860 -msgid "Box" -msgstr "Box" - -#: function_panel.cxx:866 -msgid "Clock" -msgstr "နာရီ" - -#: function_panel.cxx:872 -msgid "Help Browser" -msgstr "အကူအညီ browser" - -#: function_panel.cxx:878 -msgid "Progress" -msgstr "တိုးတက်သည်" - -#: function_panel.cxx:904 -msgid "Code View" -msgstr "ကုဒ်ကြည့်ရှူ့ရန်" - -#: function_panel.cxx:911 -msgid "Source" -msgstr "အရင်းအမြစ်" - -#: function_panel.cxx:931 -msgid "Header" -msgstr "ခေါင်းစီး" - -#: function_panel.cxx:953 -msgid "Refresh" -msgstr "Refresh" - -#: function_panel.cxx:957 -msgid "Auto-Refresh" -msgstr "အလိုအလျှောက် refresh" - -#: function_panel.cxx:961 -msgid "Auto-Position" -msgstr "အလိုအလျှောက်နေရာချ" - -#: alignment_panel.cxx:51 alignment_panel.cxx:183 -msgid "None" -msgstr "ဘာမျှမဟုတ်" - -#: alignment_panel.cxx:52 -msgid "GNU gettext" -msgstr "GNU gettext" - -#: alignment_panel.cxx:53 -msgid "POSIX catgets" -msgstr "POSIX catgets" - -#: alignment_panel.cxx:66 -msgid "Project Settings" -msgstr "ပရောဂျက်ဆက်တင်" - -#: alignment_panel.cxx:68 alignment_panel.cxx:272 alignment_panel.cxx:434 -msgid "Close this dialog." -msgstr "Dialoag ကိုပိတ်ပါ။" - -#: alignment_panel.cxx:77 -msgid "Use \"name.ext\" to set name or just \".ext\" to set extension." -msgstr "" -"\" အမည် ext\" ကို set name (သို ့မဟုတ်)\" .ext\" ကို extension " -"ဟုသတ်မှတ်ပြီးအသုံးပြုပါ။" - -#: alignment_panel.cxx:81 -msgid "Header File:" -msgstr "ခေါင်းစီးဖိုင်" - -#: alignment_panel.cxx:82 -msgid "The name of the generated header file." -msgstr "" - -#: alignment_panel.cxx:91 -msgid "Code File:" -msgstr "ကုဒ်ဖိုင်" - -#: alignment_panel.cxx:92 -msgid "The name of the generated code file." -msgstr "ထုတ်လုပ်ထားသောကုဒ်ဖိုင်အမည်" - -#: alignment_panel.cxx:101 -msgid "Include Header from Code" -msgstr "ကုဒ်မှ header ပါဝင်မှ ု" - -#: alignment_panel.cxx:102 -msgid "Include the header file from the code file." -msgstr "ကုဒ်ဖိုင်မှ header ဖိုင်ပါဝင်မှ ု" - -#: alignment_panel.cxx:107 -msgid "Generate menu shortcuts using FL_COMMAND" -msgstr "" - -#: alignment_panel.cxx:108 -msgid "Replace FL_CTRL with FL_COMMAND when generating menu shortcut code." -msgstr "" - -#: alignment_panel.cxx:115 -msgid "Internationalization" -msgstr "" - -#: alignment_panel.cxx:118 -msgid "Use:" -msgstr "အသုံးပြုသည် -" - -#: alignment_panel.cxx:119 -msgid "Type of internationalization to use." -msgstr "အသုံးပြုနိုင်ရန်ထိန်းချုပ်မှ ုမျိုးကွဲများ။" - -#: alignment_panel.cxx:128 -msgid "#include:" -msgstr "#ပါရှိသည် -" - -#: alignment_panel.cxx:129 -msgid "The include file for internationalization." -msgstr "" - -#: alignment_panel.cxx:137 -msgid "File:" -msgstr "ဖိုင်" - -#: alignment_panel.cxx:138 -msgid "The name of the message catalog." -msgstr "မက်ဆေ့ကတ်တလောက်၏အမည်။" - -#: alignment_panel.cxx:146 -msgid "Set:" -msgstr "သတ်မှတ်သည် -" - -#: alignment_panel.cxx:147 -msgid "The message set number." -msgstr "မက်ဆေ့သည်နံပါတ်ကိုသတ်မှတ်သည်" - -#: alignment_panel.cxx:156 -msgid "Function:" -msgstr "လုပ်ငန်း -" - -#: alignment_panel.cxx:157 -msgid "The function to call to internationalize the labels and tooltips." -msgstr "" -"ဤလုပ်ငန်းစဉ်နှင့် label နှင့် tooltips " -"ကိုတစ်စုံတစ်ယောက်ထိန်းချုပ်နိုင်အောင်ခေါ်ယူအသုံးပြုခြင်းဖြစ်သည်" - -#: alignment_panel.cxx:182 -msgid "Default" -msgstr "မူလအခြေအနေ" - -#: alignment_panel.cxx:184 -msgid "Plastic" -msgstr "ပလတ်စတစ်" - -#: alignment_panel.cxx:185 -msgid "GTK+" -msgstr "GTK+" - -#: alignment_panel.cxx:226 -msgid "GUI Settings" -msgstr "GUI ဆက်တင်များ" - -#: alignment_panel.cxx:227 -msgid "Scheme:" -msgstr "စီမံချက်/စနစ်/အကြံအစည်" - -#: alignment_panel.cxx:237 -msgid "" -"Options:\n" -"\n" -"\n" -"\n" -"\n" -msgstr "" -"ရွေးချယ်ခွင့်များ\n" -"\n" -"\n" -"\n" -"\n" - -#: alignment_panel.cxx:240 -msgid "Show Tooltips" -msgstr "Tooltips ကိုပြပါ" - -#: alignment_panel.cxx:248 -msgid "Show Completion Dialogs" -msgstr "ပြီးဆုံးမှ ုကိုဖော်ပြသော dialog box ကိုပြသည်" - -#: alignment_panel.cxx:255 -msgid "Open Previous File on Startup" -msgstr "Startup ပေါ်တွင်ယခင်ကဖိုင်များပြန်ဖွင့်သည်" - -#: alignment_panel.cxx:262 -msgid "Remember Window Positions" -msgstr "Window ၏နေရာများကိုမှတ်မိသည်" - -#: alignment_panel.cxx:275 -msgid "# Recent Files:" -msgstr "#မကြာသေးမီကအသုံးပြုထားသောဖိုင်များ -" - -#: alignment_panel.cxx:332 -msgid "Shell Command" -msgstr "Shell Command" - -#: alignment_panel.cxx:333 -msgid "Command:" -msgstr "Command:" - -#: alignment_panel.cxx:341 -msgid "Write Code" -msgstr "ကုဒ်ရေးပါ" - -#: alignment_panel.cxx:348 -msgid "Write Messages" -msgstr "မက်ဆေ့များရေးပါ" - -#: alignment_panel.cxx:355 -msgid "Save .FL File" -msgstr ".FL ဖိုင်ဖြင့်သိမ်းပါ" - -#: alignment_panel.cxx:362 -msgid "Run Command" -msgstr "Run ကွန်မန်း" - -#: alignment_panel.cxx:370 -msgid "Shell Command Output" -msgstr "" - -#: alignment_panel.cxx:403 -msgid "Layout Settings" -msgstr "" - -#: alignment_panel.cxx:404 -msgid "x" -msgstr "x" - -#: alignment_panel.cxx:405 -msgid "Horizontal grid spacing." -msgstr "" - -#: alignment_panel.cxx:412 -msgid "pixels" -msgstr "pixels" - -#: alignment_panel.cxx:413 -msgid "Vertical grid spacing." -msgstr "" - -#: alignment_panel.cxx:420 -msgid "pixel snap" -msgstr "pixel snap" - -#: alignment_panel.cxx:421 -msgid "Snap to grid within this many pixels." -msgstr "" - -#: alignment_panel.cxx:428 -msgid "Show Guides" -msgstr "လမ်းညွန်ချက်များကိုပြသသည်။" - -#: alignment_panel.cxx:429 -msgid "Show distance and alignment guides in overlay" -msgstr "Overlay တွင်အကွာအဝေးနှင့်ဖြောင့်တန်းမှ ုကိုပြသည်" - -#: alignment_panel.cxx:437 -msgid "Grid:" -msgstr "Grid:" - -#: alignment_panel.cxx:441 -msgid "Widget Size:" -msgstr "Widget အရွယ်အစား" - -#: alignment_panel.cxx:451 -msgid "tiny" -msgstr "အလွန်သေးငယ်သော" - -#: alignment_panel.cxx:460 -msgid "small" -msgstr "သေးငယ်သော" - -#: alignment_panel.cxx:469 -msgid "normal" -msgstr "ပုံမှန်" - -#: alignment_panel.cxx:477 -msgid "medium" -msgstr "အလယ်အလတ်" - -#: alignment_panel.cxx:486 -msgid "large" -msgstr "ကြီးသော" - -#: alignment_panel.cxx:495 -msgid "huge" -msgstr "အလွန်ကြီးမားသော" - -#: factory.cxx:94 factory.cxx:353 factory.cxx:427 factory.cxx:751 -msgid "Normal" -msgstr "ပုံမှန်" - -#: factory.cxx:95 -msgid "Toggle" -msgstr "Toggle" - -#: factory.cxx:96 -msgid "Radio" -msgstr "ရေဒီယို" - -#: factory.cxx:207 -msgid "No Select" -msgstr "မရွေးချယ်ပါ" - -#: factory.cxx:208 -msgid "Select" -msgstr "ရွေးချယ်ပါ" - -#: factory.cxx:209 -msgid "Hold" -msgstr "ကိုင်ထားသည်" - -#: factory.cxx:210 -msgid "Multi" -msgstr "တစ်ခုထက်ပိုသော" - -#: factory.cxx:354 -msgid "Simple" -msgstr "ရိုးရှင်းသော" - -#: factory.cxx:428 factory.cxx:752 -msgid "Multiline" -msgstr "Multiline" - -#: factory.cxx:429 -msgid "Secret" -msgstr "လျှို့ဝှက်ချက်" - -#: factory.cxx:430 -msgid "Int" -msgstr "Int" - -#: factory.cxx:431 -msgid "Float" -msgstr "Float" - -#: factory.cxx:673 -msgid "Dot" -msgstr "Dot" - -#: factory.cxx:674 -msgid "Line" -msgstr "လိုင်း" - -#: factory.cxx:675 -msgid "Fill" -msgstr "ဖြည့်ပါ" - -#: factory.cxx:693 factory.cxx:712 factory.cxx:732 -msgid "Vertical" -msgstr "ဒေါင်လိုက်" - -#: factory.cxx:694 factory.cxx:713 factory.cxx:733 -msgid "Horizontal" -msgstr "ရေပြင်ညီ" - -#: factory.cxx:714 -msgid "Vert Fill" -msgstr "" - -#: factory.cxx:715 -msgid "Horz Fill" -msgstr "Horz Fill" - -#: factory.cxx:716 -msgid "Vert Knob" -msgstr "Vert Knob" - -#: factory.cxx:717 -msgid "Horz Knob" -msgstr "Horz Knob" - -#: factory.cxx:952 -msgid "Function/Method" -msgstr "လုပ်ငန်းတာဝန်/နည်းလမ်း" - -#: factory.cxx:970 -msgid "Buttons" -msgstr "ဖိနှိပ်ရန်နေရာများ ၊ခလုတ်များ" - -#: factory.cxx:978 -msgid "Valuators" -msgstr "Valuators" - -#: factory.cxx:990 -msgid "Text" -msgstr "စာ" - -#: factory.cxx:997 -msgid "Menus" -msgstr "မီနူးများ" - -#: factory.cxx:1005 -msgid "Browsers" -msgstr "Browsers" - -#: factory.cxx:1010 -msgid "Other" -msgstr "အခြား" - -#: print_panel.cxx:122 -msgid "Letter" -msgstr "စာရွက်/စာ" - -#: print_panel.cxx:123 -msgid "A4" -msgstr "A4" - -#: print_panel.cxx:250 print_panel.cxx:439 -msgid "Print" -msgstr "ပရင့္" - -#: print_panel.cxx:253 -msgid "Printer:" -msgstr "ပရင်တာ" - -#: print_panel.cxx:259 -msgid "Properties..." -msgstr "လက္ခဏာများ..." - -#: print_panel.cxx:262 -msgid "printer/job status" -msgstr "394. ပရင်တာ/အလုပ် ၏အခြေအနေ" - -#: print_panel.cxx:265 -msgid "Print Range" -msgstr "" - -#: print_panel.cxx:269 -msgid "All" -msgstr "အားလုံး" - -#: print_panel.cxx:275 -msgid "Pages" -msgstr "စာမျက်နှာများ" - -#: print_panel.cxx:280 -msgid "Selection" -msgstr "ရွေးချယ်မှ ု" - -#: print_panel.cxx:285 -msgid "From:" -msgstr "မှ" - -#: print_panel.cxx:290 -msgid "To:" -msgstr "သို့-" - -#: print_panel.cxx:297 -msgid "Copies" -msgstr "မိတ္တူများ" - -#: print_panel.cxx:301 -msgid "# Copies:" -msgstr "# မိတ္တူများ" - -#: print_panel.cxx:305 -msgid "Collate" -msgstr "စာမျက်နှာစီသည်" - -#: print_panel.cxx:313 print_panel.cxx:320 print_panel.cxx:327 -#: print_panel.cxx:393 print_panel.cxx:411 print_panel.cxx:429 -msgid "1" -msgstr "၁" - -#: print_panel.cxx:334 print_panel.cxx:341 print_panel.cxx:348 -#: print_panel.cxx:387 print_panel.cxx:405 print_panel.cxx:423 -msgid "2" -msgstr "၂" - -#: print_panel.cxx:355 print_panel.cxx:362 print_panel.cxx:369 -#: print_panel.cxx:381 print_panel.cxx:399 print_panel.cxx:417 -msgid "3" -msgstr "၃" - -#: print_panel.cxx:454 -msgid "Printer Properties" -msgstr "ပရင်တာ၏လက္ခဏာများ" - -#: print_panel.cxx:457 -msgid "Page Size:" -msgstr "စာမျက်နှာအရွယ်အစား" - -#: print_panel.cxx:462 -msgid "Output Mode:" -msgstr "Output နည်းလမ်-" - -#: print_panel.cxx:500 template_panel.cxx:184 -msgid "Save" -msgstr "သိမ်းဆည်းပါ" - -#: print_panel.cxx:506 -msgid "Use" -msgstr "အသုံးပြုပါ" - -#: template_panel.cxx:148 -msgid "New/Save Template" -msgstr "အသစ်/သိမ်းဆည်း ပုံစံ" - -#: template_panel.cxx:151 -msgid "Available Templates:" -msgstr "ရရှိနိုင်သောပုံစံများ -" - -#: template_panel.cxx:163 -msgid "Template Name:" -msgstr "ပုံစံ၏အမည် -" - -#: template_panel.cxx:169 -msgid "Instance Name:" -msgstr "နမူနာအမည် -" - -#: template_panel.cxx:175 -msgid "Delete Template" -msgstr "ပုံစံကိုပယ်ဖျက်ပါ" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/friendly-recovery.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/friendly-recovery.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/friendly-recovery.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/friendly-recovery.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:17+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/git.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/git.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/git.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/git.po 2016-04-15 08:51:15.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:37+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:17+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: advice.c:55 #, c-format @@ -29,7 +29,7 @@ "as appropriate to mark resolution and make a commit." msgstr "" -#: builtin/merge.c:1227 git-pull.sh:74 +#: advice.c:101 builtin/merge.c:1225 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -41,93 +41,93 @@ msgid "Exiting because of unfinished merge." msgstr "" -#: archive.c:11 +#: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:12 +#: archive.c:13 msgid "git archive --list" msgstr "" -#: archive.c:13 +#: archive.c:14 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:14 +#: archive.c:15 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:427 +#: archive.c:429 msgid "fmt" msgstr "" -#: archive.c:427 +#: archive.c:429 msgid "archive format" msgstr "" -#: archive.c:428 builtin/log.c:1204 +#: archive.c:430 builtin/log.c:1229 msgid "prefix" msgstr "" -#: archive.c:429 +#: archive.c:431 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 -#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 +#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395 +#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "" -#: archive.c:431 builtin/archive.c:89 +#: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:433 +#: archive.c:435 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:434 +#: archive.c:436 msgid "report archived files on stderr" msgstr "" -#: archive.c:435 +#: archive.c:437 msgid "store only" msgstr "" -#: archive.c:436 +#: archive.c:438 msgid "compress faster" msgstr "" -#: archive.c:444 +#: archive.c:446 msgid "compress better" msgstr "" -#: archive.c:447 +#: archive.c:449 msgid "list supported archive formats" msgstr "" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "" -#: archive.c:450 builtin/archive.c:91 +#: archive.c:452 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479 msgid "command" msgstr "" -#: archive.c:452 builtin/archive.c:93 +#: archive.c:454 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" @@ -137,82 +137,82 @@ "Use '\\!' for literal leading exclamation." msgstr "" -#: branch.c:60 +#: branch.c:61 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" -#: branch.c:83 +#: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" -#: branch.c:84 +#: branch.c:85 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" -#: branch.c:88 +#: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" -#: branch.c:89 +#: branch.c:90 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" -#: branch.c:94 +#: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" -#: branch.c:95 +#: branch.c:96 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" -#: branch.c:99 +#: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" -#: branch.c:100 +#: branch.c:101 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" -#: branch.c:133 +#: branch.c:134 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:162 +#: branch.c:163 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:167 +#: branch.c:168 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:175 +#: branch.c:176 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:195 +#: branch.c:196 #, c-format msgid "" "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:197 +#: branch.c:198 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:199 +#: branch.c:200 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -224,22 +224,22 @@ "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:243 +#: branch.c:244 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:263 +#: branch.c:264 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:268 +#: branch.c:269 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: builtin/checkout.c:931 +#: branch.c:322 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" @@ -263,9 +263,9 @@ msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 +#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083 +#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334 +#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" @@ -288,47 +288,48 @@ msgstr[0] "" msgstr[1] "" -#: bundle.c:251 +#: bundle.c:253 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:269 +#: bundle.c:264 msgid "pack-objects died" msgstr "" -#: bundle.c:309 +#: bundle.c:304 msgid "rev-list died" msgstr "" -#: bundle.c:358 +#: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:443 +#: bundle.c:449 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:453 +#: bundle.c:459 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:474 +#: bundle.c:480 msgid "index-pack died" msgstr "" -#: color.c:260 +#: color.c:275 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 +#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520 +#: builtin/am.c:2149 #, c-format msgid "could not parse %s" msgstr "" @@ -477,22 +478,22 @@ msgid "Performing inexact rename detection" msgstr "" -#: diff.c:114 +#: diff.c:115 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:119 +#: diff.c:120 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:214 +#: diff.c:215 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:266 +#: diff.c:267 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -501,16 +502,16 @@ "'diff.dirstat' config variable တွင်အမှားများတွေ့ရှိသည် -\n" "%s" -#: diff.c:2997 +#: diff.c:3000 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3393 +#: diff.c:3396 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3556 +#: diff.c:3559 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -520,37 +521,37 @@ "ကိုပိုင်းခြားစစ်ဆေးဖော်ထုတ်ရာတွင်မအောင်မြင်ပါ -\n" "%s" -#: diff.c:3570 +#: diff.c:3573 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: dir.c:1852 +#: dir.c:1915 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:1945 +#: dir.c:1998 msgid "Untracked cache is disabled on this system." msgstr "" -#: gpg-interface.c:129 gpg-interface.c:200 +#: gpg-interface.c:166 gpg-interface.c:237 msgid "could not run gpg." msgstr "gpg ကိုမမောင်းနှင်နိုင်ပါ။" -#: gpg-interface.c:141 +#: gpg-interface.c:178 msgid "gpg did not accept the data" msgstr "gpg သည်ဒေတာကိုလက်မခံခဲ့ပါ" -#: gpg-interface.c:152 +#: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "ိဒေတာထဲတွင်gpg sign လုပ်ရာတွင်မအောင်မြင်ခဲ့ပါ" -#: gpg-interface.c:185 +#: gpg-interface.c:222 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" -#: gpg-interface.c:188 +#: gpg-interface.c:225 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" @@ -633,8 +634,8 @@ msgid "failed to read the cache" msgstr "" -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587 -#: builtin/clone.c:647 +#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376 +#: builtin/checkout.c:587 builtin/clone.c:722 msgid "unable to write new index file" msgstr "" @@ -652,64 +653,64 @@ msgid "error building trees" msgstr "trees များကိုတည်ဆောက်ရာတွင်အမှား" -#: merge-recursive.c:687 +#: merge-recursive.c:686 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s'%s လမ်းကြောင်းကိုတည်ဆောက်ရာတွင်မအောင်မြင်ခဲ့ပါ" -#: merge-recursive.c:698 +#: merge-recursive.c:697 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "subdirectoryအတွက်နေရာလွတ်ပေးရန် %s ဖယ်ရှားခြင်း\n" -#: merge-recursive.c:712 merge-recursive.c:733 +#: merge-recursive.c:711 merge-recursive.c:732 msgid ": perhaps a D/F conflict?" msgstr ": perhaps a D/F conflict?" -#: merge-recursive.c:723 +#: merge-recursive.c:722 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:763 +#: merge-recursive.c:762 #, c-format msgid "cannot read object %s '%s'" msgstr "မဖတ်နိုင်သောအရာဝထ္ထု %s '%s'" -#: merge-recursive.c:765 +#: merge-recursive.c:764 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:788 builtin/clone.c:306 +#: merge-recursive.c:787 builtin/clone.c:369 #, c-format msgid "failed to open '%s'" msgstr "'%s'ကိုဖွင့်ရာတွင်မအောင်မြင်ခဲ့ပါ" -#: merge-recursive.c:796 +#: merge-recursive.c:795 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:799 +#: merge-recursive.c:798 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "%06o %s '%s'နှင့်ဘာလုပ်ရမှန်းမသိပါ" -#: merge-recursive.c:937 +#: merge-recursive.c:936 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:940 #, c-format msgid "Unable to add %s to database" msgstr "databaseအတွင်း %s ကိုမပေါင်းထည့်နိုင်ပါ" -#: merge-recursive.c:957 +#: merge-recursive.c:956 msgid "unsupported object type in the tree" msgstr "tree အတွင်းတွင်မထောက်ပံ့ခဲ့သောအရာဝထ္ထုအမျိုးအစား" -#: merge-recursive.c:1032 merge-recursive.c:1046 +#: merge-recursive.c:1031 merge-recursive.c:1045 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -718,7 +719,7 @@ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." -#: merge-recursive.c:1038 merge-recursive.c:1051 +#: merge-recursive.c:1037 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -727,20 +728,20 @@ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." -#: merge-recursive.c:1092 +#: merge-recursive.c:1091 msgid "rename" msgstr "အမည္ၿပန္ေပးသည္" -#: merge-recursive.c:1092 +#: merge-recursive.c:1091 msgid "renamed" msgstr "အမည်ပြန်ပေးခဲ့သည်" -#: merge-recursive.c:1148 +#: merge-recursive.c:1147 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s is a directory in %s adding as %s instead" -#: merge-recursive.c:1170 +#: merge-recursive.c:1169 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " @@ -749,142 +750,142 @@ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 msgid " (left unresolved)" msgstr " (ချန်ထားသောပြန်လည်မဖြေရှင်းနိုင်ခဲ့မှ ု)" -#: merge-recursive.c:1229 +#: merge-recursive.c:1228 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1258 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renaming %s to %s and %s to %s instead" -#: merge-recursive.c:1458 +#: merge-recursive.c:1457 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -#: merge-recursive.c:1468 +#: merge-recursive.c:1467 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1473 merge-recursive.c:1671 +#: merge-recursive.c:1472 merge-recursive.c:1674 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1524 +#: merge-recursive.c:1523 #, c-format msgid "cannot read object %s" msgstr "မဖတ်နိုင်သောအရာ %s" -#: merge-recursive.c:1527 +#: merge-recursive.c:1526 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1575 +#: merge-recursive.c:1578 msgid "modify" msgstr "ပြုပြင်မွမ်းမံ" -#: merge-recursive.c:1575 +#: merge-recursive.c:1578 msgid "modified" msgstr "ပြုပြင်မွမ်းမံခဲ့သည်" -#: merge-recursive.c:1585 +#: merge-recursive.c:1588 msgid "content" msgstr "မာတိကာ" -#: merge-recursive.c:1592 +#: merge-recursive.c:1595 msgid "add/add" msgstr "ထည့်သည်/ထည့်သည်" -#: merge-recursive.c:1626 +#: merge-recursive.c:1629 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1640 +#: merge-recursive.c:1643 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1644 git-submodule.sh:1150 +#: merge-recursive.c:1647 git-submodule.sh:1025 msgid "submodule" msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1648 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1731 +#: merge-recursive.c:1734 #, c-format msgid "Removing %s" msgstr "ဖယ်ရှားနေသည် %s" -#: merge-recursive.c:1756 +#: merge-recursive.c:1759 msgid "file/directory" msgstr "file/directory" -#: merge-recursive.c:1762 +#: merge-recursive.c:1765 msgid "directory/file" msgstr "directory/file" -#: merge-recursive.c:1767 +#: merge-recursive.c:1770 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1777 +#: merge-recursive.c:1780 #, c-format msgid "Adding %s" msgstr "ထည့်နေသည် %s" -#: merge-recursive.c:1794 +#: merge-recursive.c:1797 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1813 +#: merge-recursive.c:1816 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1822 +#: merge-recursive.c:1825 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1852 +#: merge-recursive.c:1855 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1900 +#: merge-recursive.c:1903 msgid "Merging:" msgstr "" -#: merge-recursive.c:1913 +#: merge-recursive.c:1916 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "found %u common ancestor:" -#: merge-recursive.c:1950 +#: merge-recursive.c:1953 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2007 +#: merge-recursive.c:2010 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2018 builtin/merge.c:645 +#: merge-recursive.c:2021 builtin/merge.c:645 msgid "Unable to write index." msgstr "အညွန်းအတွင်းမရေးနိုင်ပါ။" @@ -892,19 +893,19 @@ msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:82 +#: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:92 +#: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: notes-utils.c:119 +#: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" msgstr "" @@ -914,37 +915,37 @@ msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:546 +#: parse-options.c:570 msgid "..." msgstr "..." -#: parse-options.c:564 +#: parse-options.c:588 #, c-format msgid "usage: %s" msgstr "အသုံးပြုမှ ု- %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:568 +#: parse-options.c:592 #, c-format msgid " or: %s" msgstr " သို့မဟုတ်: %s" -#: parse-options.c:571 +#: parse-options.c:595 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:605 +#: parse-options.c:629 msgid "-NUM" msgstr "" -#: builtin/tag.c:561 +#: parse-options-cb.c:108 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/init-db.c:35 +#: path.c:752 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -1009,29 +1010,29 @@ "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: pretty.c:968 +#: pretty.c:969 msgid "unable to parse --pretty format" msgstr "" -#: progress.c:236 +#: progress.c:235 msgid "done" msgstr "" -#: read-cache.c:1295 +#: read-cache.c:1281 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1305 +#: read-cache.c:1291 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 #: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" @@ -1067,7 +1068,7 @@ msgid "expected format: %%(color:<color>)" msgstr "" -#: builtin/for-each-ref.c:687 +#: ref-filter.c:835 msgid "unable to parse format" msgstr "" @@ -1086,7 +1087,7 @@ msgid "positive width expected with the %%(align) atom" msgstr "" -#: builtin/tag.c:69 +#: ref-filter.c:1219 #, c-format msgid "malformed object at '%s'" msgstr "" @@ -1096,98 +1097,98 @@ msgid "format: %%(end) atom missing" msgstr "" -#: builtin/branch.c:758 +#: ref-filter.c:1615 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:792 +#: remote.c:756 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:796 +#: remote.c:760 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:800 +#: remote.c:764 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:808 +#: remote.c:772 msgid "Internal error" msgstr "" -#: remote.c:1723 remote.c:1766 +#: remote.c:1687 remote.c:1730 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1732 +#: remote.c:1696 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1735 +#: remote.c:1699 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1741 +#: remote.c:1705 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1756 +#: remote.c:1720 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1771 +#: remote.c:1735 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1782 +#: remote.c:1746 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1795 +#: remote.c:1759 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1817 +#: remote.c:1781 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2124 +#: remote.c:2083 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2128 +#: remote.c:2087 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2131 +#: remote.c:2090 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2135 +#: remote.c:2094 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2141 +#: remote.c:2100 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2144 +#: remote.c:2103 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1195,11 +1196,11 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2152 +#: remote.c:2111 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2155 +#: remote.c:2114 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1210,7 +1211,7 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2165 +#: remote.c:2124 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -1223,24 +1224,24 @@ msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2366 +#: revision.c:2390 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:83 +#: run-command.c:90 msgid "open /dev/null failed" msgstr "" -#: run-command.c:85 +#: run-command.c:92 #, c-format msgid "dup2(%d,%d) failed" msgstr "" -#: send-pack.c:272 +#: send-pack.c:295 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:378 +#: send-pack.c:404 msgid "the receiving end does not support --signed push" msgstr "" @@ -1250,246 +1251,246 @@ "signed push" msgstr "" -#: send-pack.c:389 +#: send-pack.c:418 msgid "the receiving end does not support --atomic push" msgstr "" -#: sequencer.c:195 +#: sequencer.c:183 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:198 +#: sequencer.c:186 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:211 sequencer.c:861 sequencer.c:944 +#: sequencer.c:199 sequencer.c:842 sequencer.c:922 #, c-format msgid "Could not write to %s" msgstr "'%s' တွင်မရေးနိုင်ခဲ့ပါ" -#: sequencer.c:214 +#: sequencer.c:202 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:229 +#: sequencer.c:217 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:231 +#: sequencer.c:219 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:234 +#: sequencer.c:222 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:321 +#: sequencer.c:309 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:339 +#: sequencer.c:327 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:359 +#: sequencer.c:347 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:411 +#: sequencer.c:399 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:416 +#: sequencer.c:404 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:482 +#: sequencer.c:469 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:501 +#: sequencer.c:488 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:509 +#: sequencer.c:496 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:513 +#: sequencer.c:500 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:526 +#: sequencer.c:513 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:530 +#: sequencer.c:517 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:616 +#: sequencer.c:603 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:617 +#: sequencer.c:604 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:653 +#: sequencer.c:639 msgid "empty commit set passed" msgstr "" -#: sequencer.c:661 +#: sequencer.c:647 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:665 +#: sequencer.c:651 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:725 +#: sequencer.c:711 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:747 +#: sequencer.c:733 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:752 +#: sequencer.c:738 msgid "No commits parsed." msgstr "" -#: sequencer.c:765 +#: sequencer.c:750 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:769 +#: sequencer.c:754 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:776 +#: sequencer.c:761 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:806 +#: sequencer.c:791 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:809 +#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:821 +#: sequencer.c:804 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:842 +#: sequencer.c:823 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:843 +#: sequencer.c:824 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:847 +#: sequencer.c:828 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:863 sequencer.c:948 +#: sequencer.c:844 sequencer.c:926 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:882 sequencer.c:1018 +#: sequencer.c:863 sequencer.c:996 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:884 +#: sequencer.c:865 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:886 +#: sequencer.c:867 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:908 builtin/apply.c:4291 +#: sequencer.c:887 builtin/apply.c:4287 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:911 +#: sequencer.c:890 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:912 +#: sequencer.c:891 msgid "unexpected end of file" msgstr "" -#: sequencer.c:918 +#: sequencer.c:897 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:941 +#: sequencer.c:919 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1086 +#: sequencer.c:1064 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1089 +#: sequencer.c:1067 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1123 +#: sequencer.c:1101 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1124 +#: sequencer.c:1102 msgid "Can't cherry-pick into empty head" msgstr "" -#: setup.c:243 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "" -#: sha1_name.c:453 +#: sha1_name.c:463 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1502,30 +1503,30 @@ "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:64 submodule.c:98 +#: submodule.c:61 submodule.c:95 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:68 submodule.c:102 +#: submodule.c:65 submodule.c:99 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:76 +#: submodule.c:73 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:109 +#: submodule.c:106 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:120 +#: submodule.c:117 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1115 +#: submodule.c:1040 #, c-format msgid "Could not set core.worktree in %s" msgstr "" @@ -1536,7 +1537,7 @@ msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:296 #, c-format msgid "more than one %s" msgstr "" @@ -1603,224 +1604,225 @@ msgid "could not open '%s' for writing" msgstr "" -#: builtin/commit.c:1689 builtin/merge.c:1076 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691 +#: builtin/merge.c:1074 builtin/pull.c:380 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: wrapper.c:523 +#: wrapper.c:579 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:544 +#: wrapper.c:600 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:564 +#: wrapper.c:608 msgid "unable to get current working directory" msgstr "" -#: wrapper.c:575 +#: wrapper.c:635 #, c-format msgid "could not open %s for writing" msgstr "" -#: wrapper.c:587 +#: wrapper.c:646 builtin/am.c:425 #, c-format msgid "could not write to %s" msgstr "" -#: wrapper.c:593 +#: wrapper.c:652 #, c-format msgid "could not close %s" msgstr "" -#: wt-status.c:150 +#: wt-status.c:149 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:176 wt-status.c:203 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:178 wt-status.c:205 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:183 +#: wt-status.c:182 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:184 wt-status.c:188 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:187 +#: wt-status.c:186 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 wt-status.c:881 +#: wt-status.c:197 wt-status.c:880 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:215 wt-status.c:889 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:220 +#: wt-status.c:219 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:222 +#: wt-status.c:221 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:223 +#: wt-status.c:222 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:225 +#: wt-status.c:224 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:237 +#: wt-status.c:236 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:252 +#: wt-status.c:251 msgid "both deleted:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:253 msgid "added by us:" msgstr "" -#: wt-status.c:256 +#: wt-status.c:255 msgid "deleted by them:" msgstr "" -#: wt-status.c:258 +#: wt-status.c:257 msgid "added by them:" msgstr "" -#: wt-status.c:260 +#: wt-status.c:259 msgid "deleted by us:" msgstr "" -#: wt-status.c:262 +#: wt-status.c:261 msgid "both added:" msgstr "" -#: wt-status.c:264 +#: wt-status.c:263 msgid "both modified:" msgstr "" -#: wt-status.c:266 +#: wt-status.c:265 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:274 +#: wt-status.c:273 msgid "new file:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:275 msgid "copied:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:277 msgid "deleted:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:279 msgid "modified:" msgstr "" -#: wt-status.c:282 +#: wt-status.c:281 msgid "renamed:" msgstr "" -#: wt-status.c:284 +#: wt-status.c:283 msgid "typechange:" msgstr "" -#: wt-status.c:286 +#: wt-status.c:285 msgid "unknown:" msgstr "" -#: wt-status.c:288 +#: wt-status.c:287 msgid "unmerged:" msgstr "" -#: wt-status.c:370 +#: wt-status.c:369 msgid "new commits, " msgstr "" -#: wt-status.c:372 +#: wt-status.c:371 msgid "modified content, " msgstr "" -#: wt-status.c:374 +#: wt-status.c:373 msgid "untracked content, " msgstr "" -#: wt-status.c:391 +#: wt-status.c:390 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:755 +#: wt-status.c:754 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:757 +#: wt-status.c:756 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:838 +#: wt-status.c:837 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:949 +#: wt-status.c:948 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:952 +#: wt-status.c:951 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:955 +#: wt-status.c:954 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:958 +#: wt-status.c:957 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:968 +#: wt-status.c:967 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:971 +#: wt-status.c:970 msgid "The current patch is empty." msgstr "" -#: wt-status.c:975 +#: wt-status.c:974 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:977 +#: wt-status.c:976 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:979 +#: wt-status.c:978 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" @@ -1855,114 +1857,114 @@ msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1039 wt-status.c:1056 +#: wt-status.c:1148 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1044 wt-status.c:1061 +#: wt-status.c:1153 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1047 +#: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1049 +#: wt-status.c:1169 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1051 +#: wt-status.c:1171 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1064 +#: wt-status.c:1177 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1068 +#: wt-status.c:1181 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1073 +#: wt-status.c:1186 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1076 +#: wt-status.c:1189 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1080 +#: wt-status.c:1193 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1085 +#: wt-status.c:1198 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1088 +#: wt-status.c:1201 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1090 +#: wt-status.c:1203 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1100 +#: wt-status.c:1213 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1105 +#: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1108 +#: wt-status.c:1221 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1223 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1119 +#: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1124 +#: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1127 +#: wt-status.c:1240 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1129 +#: wt-status.c:1242 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1140 +#: wt-status.c:1253 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1257 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1260 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1438 msgid "On branch " msgstr "" @@ -1970,35 +1972,35 @@ msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1331 +#: wt-status.c:1446 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1336 +#: wt-status.c:1451 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1338 +#: wt-status.c:1453 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1341 +#: wt-status.c:1456 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1358 +#: wt-status.c:1474 msgid "Initial commit" msgstr "" -#: wt-status.c:1372 +#: wt-status.c:1488 msgid "Untracked files" msgstr "" -#: wt-status.c:1374 +#: wt-status.c:1490 msgid "Ignored files" msgstr "" -#: wt-status.c:1378 +#: wt-status.c:1494 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2006,79 +2008,79 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1500 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1386 +#: wt-status.c:1502 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1392 +#: wt-status.c:1508 msgid "No changes" msgstr "" -#: wt-status.c:1397 +#: wt-status.c:1513 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1400 +#: wt-status.c:1516 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1519 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1522 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1409 +#: wt-status.c:1525 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1412 wt-status.c:1417 +#: wt-status.c:1528 wt-status.c:1533 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1415 +#: wt-status.c:1531 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1419 +#: wt-status.c:1535 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1534 +#: wt-status.c:1642 msgid "Initial commit on " msgstr "" -#: wt-status.c:1528 +#: wt-status.c:1646 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1561 +#: wt-status.c:1675 msgid "gone" msgstr "" -#: wt-status.c:1563 wt-status.c:1571 +#: wt-status.c:1677 wt-status.c:1685 msgid "behind " msgstr "" -#: compat/precompose_utf8.c:55 builtin/clone.c:345 +#: compat/precompose_utf8.c:56 builtin/clone.c:408 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -2092,7 +2094,7 @@ msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:277 +#: builtin/add.c:70 builtin/commit.c:278 msgid "updating files failed" msgstr "" @@ -2140,15 +2142,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 -#: builtin/rm.c:268 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543 +#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "" -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 -#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 +#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -2156,7 +2158,7 @@ msgid "interactive picking" msgstr "" -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -2213,22 +2215,23 @@ msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:358 +#: builtin/add.c:352 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:353 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:40 msgid "index file corrupt" msgstr "" -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "" @@ -2237,7 +2240,7 @@ msgid "could not stat %s" msgstr "" -#: builtin/commit.c:738 builtin/merge.c:1079 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077 #, c-format msgid "could not read '%s'" msgstr "" @@ -2251,12 +2254,12 @@ msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/notes.c:299 +#: builtin/am.c:563 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:314 +#: builtin/am.c:600 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" @@ -2280,7 +2283,7 @@ msgid "could not parse patch '%s'" msgstr "" -#: git-am.sh:280 +#: builtin/am.c:868 msgid "Only one StGIT patch series can be applied at once" msgstr "" @@ -2296,11 +2299,11 @@ msgid "invalid timezone offset" msgstr "" -#: git-am.sh:369 +#: builtin/am.c:1011 msgid "Patch format detection failed." msgstr "" -#: builtin/clone.c:310 +#: builtin/am.c:1016 builtin/clone.c:373 #, c-format msgid "failed to create directory '%s'" msgstr "" @@ -2309,7 +2312,7 @@ msgid "Failed to split patches." msgstr "" -#: builtin/commit.c:361 +#: builtin/am.c:1152 builtin/commit.c:363 msgid "unable to write index file" msgstr "" @@ -2332,7 +2335,7 @@ msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/log.c:1320 +#: builtin/am.c:1417 builtin/log.c:1347 #, c-format msgid "invalid ident line: %s" msgstr "" @@ -2342,37 +2345,38 @@ msgid "unable to parse commit %s" msgstr "" -#: git-am.sh:142 +#: builtin/am.c:1646 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:144 +#: builtin/am.c:1648 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: git-am.sh:159 +#: builtin/am.c:1667 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:168 +#: builtin/am.c:1673 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: git-am.sh:185 +#: builtin/am.c:1688 msgid "Failed to merge in the changes." msgstr "" -#: builtin/merge.c:632 +#: builtin/am.c:1712 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "" -#: git-am.sh:945 +#: builtin/am.c:1719 msgid "applying to an empty history" msgstr "" -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829 +#: builtin/merge.c:854 msgid "failed to write commit object" msgstr "" @@ -2381,11 +2385,11 @@ msgid "cannot resume: %s does not exist." msgstr "" -#: git-am.sh:821 +#: builtin/am.c:1784 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:825 +#: builtin/am.c:1789 msgid "Commit Body is:" msgstr "" @@ -2407,7 +2411,7 @@ msgid "Applying: %.*s" msgstr "" -#: git-am.sh:913 +#: builtin/am.c:1900 msgid "No changes -- Patch already applied." msgstr "" @@ -2421,7 +2425,7 @@ msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: git-am.sh:889 +#: builtin/am.c:1958 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2434,7 +2438,8 @@ "Did you forget to use 'git add'?" msgstr "" -#: builtin/reset.c:308 builtin/reset.c:316 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308 +#: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" @@ -2443,7 +2448,7 @@ msgid "failed to clean index" msgstr "" -#: git-am.sh:100 +#: builtin/am.c:2159 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2474,7 +2479,8 @@ msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171 +#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/repack.c:171 msgid "be quiet" msgstr "" @@ -2510,7 +2516,7 @@ msgid "strip everything before a scissors line" msgstr "" -#: builtin/apply.c:4563 +#: builtin/am.c:2285 builtin/apply.c:4554 msgid "action" msgstr "" @@ -2520,27 +2526,31 @@ msgid "pass it through git-apply" msgstr "" -#: builtin/apply.c:4587 +#: builtin/am.c:2294 builtin/apply.c:4578 msgid "root" msgstr "" -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 -#: builtin/fetch.c:92 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93 +#: builtin/pull.c:167 builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 msgid "path" msgstr "" -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 -#: parse-options.h:131 parse-options.h:238 +#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "" -#: builtin/apply.c:4531 +#: builtin/am.c:2306 builtin/apply.c:4522 msgid "num" msgstr "" -#: builtin/for-each-ref.c:1108 builtin/replace.c:438 +#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 msgid "format" msgstr "" @@ -2576,8 +2586,8 @@ msgid "use current timestamp for author date" msgstr "" -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 -#: builtin/tag.c:605 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "" @@ -2589,7 +2599,7 @@ msgid "(internal use for git-rebase)" msgstr "" -#: git-am.sh:407 +#: builtin/am.c:2354 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2611,7 +2621,7 @@ "Use \"git am --abort\" to remove it." msgstr "" -#: git-am.sh:568 +#: builtin/am.c:2406 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -2619,62 +2629,62 @@ msgid "git apply [<options>] [<patch>...]" msgstr "" -#: builtin/apply.c:112 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:127 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:822 +#: builtin/apply.c:818 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:831 +#: builtin/apply.c:827 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:912 +#: builtin/apply.c:908 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:944 +#: builtin/apply.c:940 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:949 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:956 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1419 +#: builtin/apply.c:1415 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1476 +#: builtin/apply.c:1472 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1493 +#: builtin/apply.c:1489 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2685,396 +2695,396 @@ msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1659 +#: builtin/apply.c:1655 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1661 +#: builtin/apply.c:1657 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1687 +#: builtin/apply.c:1683 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1719 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1725 +#: builtin/apply.c:1721 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1728 +#: builtin/apply.c:1724 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1874 +#: builtin/apply.c:1870 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1903 +#: builtin/apply.c:1899 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2054 +#: builtin/apply.c:2050 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2144 +#: builtin/apply.c:2140 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2148 +#: builtin/apply.c:2144 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2781 +#: builtin/apply.c:2777 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2900 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2912 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2918 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2938 +#: builtin/apply.c:2934 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3039 +#: builtin/apply.c:3035 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3045 +#: builtin/apply.c:3041 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3066 +#: builtin/apply.c:3062 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3190 +#: builtin/apply.c:3186 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3243 +#: builtin/apply.c:3239 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: builtin/apply.c:3271 builtin/apply.c:3493 +#: builtin/apply.c:3267 builtin/apply.c:3489 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3352 builtin/apply.c:3507 +#: builtin/apply.c:3348 builtin/apply.c:3503 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3361 builtin/apply.c:3515 +#: builtin/apply.c:3357 builtin/apply.c:3511 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3463 +#: builtin/apply.c:3459 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3532 +#: builtin/apply.c:3528 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3534 +#: builtin/apply.c:3530 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3693 builtin/apply.c:3695 +#: builtin/apply.c:3689 builtin/apply.c:3691 #, c-format msgid "invalid path '%s'" msgstr "" -#: builtin/apply.c:3750 +#: builtin/apply.c:3746 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3753 +#: builtin/apply.c:3749 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3773 +#: builtin/apply.c:3769 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3778 +#: builtin/apply.c:3774 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3798 +#: builtin/apply.c:3794 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: builtin/apply.c:3802 +#: builtin/apply.c:3798 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3816 +#: builtin/apply.c:3812 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:4052 +#: builtin/apply.c:4048 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:4081 +#: builtin/apply.c:4077 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:4085 +#: builtin/apply.c:4081 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:4090 +#: builtin/apply.c:4086 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:4093 builtin/apply.c:4201 +#: builtin/apply.c:4089 builtin/apply.c:4197 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:4126 +#: builtin/apply.c:4122 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4175 +#: builtin/apply.c:4171 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4262 +#: builtin/apply.c:4258 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4270 +#: builtin/apply.c:4266 msgid "internal error" msgstr "" -#: builtin/apply.c:4273 +#: builtin/apply.c:4269 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4283 +#: builtin/apply.c:4279 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4304 +#: builtin/apply.c:4300 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4303 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4397 +#: builtin/apply.c:4393 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4404 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4526 +#: builtin/apply.c:4517 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4529 +#: builtin/apply.c:4520 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4532 +#: builtin/apply.c:4523 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4535 +#: builtin/apply.c:4526 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4537 +#: builtin/apply.c:4528 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4541 +#: builtin/apply.c:4532 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4543 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4545 +#: builtin/apply.c:4536 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4547 +#: builtin/apply.c:4538 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4549 +#: builtin/apply.c:4540 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4551 +#: builtin/apply.c:4542 msgid "accept a patch that touches outside the working area" msgstr "" -#: builtin/apply.c:4553 +#: builtin/apply.c:4544 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4555 +#: builtin/apply.c:4546 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4557 +#: builtin/apply.c:4548 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4562 +#: builtin/apply.c:4553 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4564 +#: builtin/apply.c:4555 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4567 builtin/apply.c:4570 +#: builtin/apply.c:4558 builtin/apply.c:4561 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4573 +#: builtin/apply.c:4564 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4575 +#: builtin/apply.c:4566 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4577 +#: builtin/apply.c:4568 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4579 +#: builtin/apply.c:4570 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4582 +#: builtin/apply.c:4573 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4585 +#: builtin/apply.c:4576 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4588 +#: builtin/apply.c:4579 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4610 +#: builtin/apply.c:4601 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4618 +#: builtin/apply.c:4609 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4621 +#: builtin/apply.c:4612 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4640 +#: builtin/apply.c:4631 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4654 +#: builtin/apply.c:4645 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4660 builtin/apply.c:4670 +#: builtin/apply.c:4651 builtin/apply.c:4661 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3128,103 +3138,103 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2500 +#: builtin/blame.c:2519 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2501 +#: builtin/blame.c:2520 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2502 +#: builtin/blame.c:2521 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2503 +#: builtin/blame.c:2522 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2504 +#: builtin/blame.c:2523 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2505 +#: builtin/blame.c:2524 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2506 +#: builtin/blame.c:2525 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2507 +#: builtin/blame.c:2526 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2508 +#: builtin/blame.c:2527 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2509 +#: builtin/blame.c:2528 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2510 +#: builtin/blame.c:2529 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2511 +#: builtin/blame.c:2530 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2512 +#: builtin/blame.c:2531 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2513 +#: builtin/blame.c:2532 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2514 +#: builtin/blame.c:2533 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2515 +#: builtin/blame.c:2534 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2516 +#: builtin/blame.c:2535 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2517 +#: builtin/blame.c:2536 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2518 builtin/blame.c:2519 +#: builtin/blame.c:2537 builtin/blame.c:2538 msgid "score" msgstr "" -#: builtin/blame.c:2518 +#: builtin/blame.c:2537 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2519 +#: builtin/blame.c:2538 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2539 msgid "n,m" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2539 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -3234,23 +3244,23 @@ #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2601 +#: builtin/blame.c:2620 msgid "4 years, 11 months ago" msgstr "" -#: builtin/branch.c:24 +#: builtin/branch.c:25 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" @@ -3258,248 +3268,248 @@ msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:150 +#: builtin/branch.c:142 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:154 +#: builtin/branch.c:146 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:168 +#: builtin/branch.c:160 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:172 +#: builtin/branch.c:164 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:185 +#: builtin/branch.c:177 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:213 +#: builtin/branch.c:205 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:219 +#: builtin/branch.c:211 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:227 +#: builtin/branch.c:219 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:243 +#: builtin/branch.c:235 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:244 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:258 +#: builtin/branch.c:251 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:252 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:266 +#: builtin/branch.c:259 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:267 +#: builtin/branch.c:260 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:451 +#: builtin/branch.c:303 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:456 +#: builtin/branch.c:308 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:461 +#: builtin/branch.c:313 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:463 +#: builtin/branch.c:315 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:467 +#: builtin/branch.c:319 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:469 +#: builtin/branch.c:321 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:472 +#: builtin/branch.c:324 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:475 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:488 +#: builtin/branch.c:340 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:366 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:582 +#: builtin/branch.c:369 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:375 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:591 +#: builtin/branch.c:378 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:382 msgid "(no branch)" msgstr "" -#: builtin/branch.c:703 +#: builtin/branch.c:524 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:713 +#: builtin/branch.c:534 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:728 +#: builtin/branch.c:549 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:732 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:736 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:743 +#: builtin/branch.c:564 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:587 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:616 msgid "Generic options" msgstr "" -#: builtin/branch.c:812 +#: builtin/branch.c:618 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:619 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:814 +#: builtin/branch.c:620 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:622 msgid "change upstream info" msgstr "" -#: builtin/branch.c:820 +#: builtin/branch.c:626 msgid "use colored output" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:627 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:825 builtin/branch.c:831 +#: builtin/branch.c:629 builtin/branch.c:630 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:837 +#: builtin/branch.c:633 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:838 +#: builtin/branch.c:634 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:636 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:637 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:842 +#: builtin/branch.c:638 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:639 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:640 msgid "list branch names" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:641 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:847 +#: builtin/branch.c:643 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:644 msgid "force creation, move/rename, deletion" msgstr "" @@ -3511,20 +3521,21 @@ msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:861 +#: builtin/branch.c:647 msgid "list branches in columns" msgstr "" -#: builtin/for-each-ref.c:1109 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1110 +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "" -#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 -#: builtin/notes.c:563 builtin/tag.c:628 +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564 +#: builtin/tag.c:369 msgid "object" msgstr "" @@ -3532,95 +3543,95 @@ msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:874 +#: builtin/branch.c:670 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:878 builtin/clone.c:622 +#: builtin/branch.c:674 builtin/clone.c:697 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:900 +#: builtin/branch.c:694 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:911 builtin/branch.c:950 +#: builtin/branch.c:705 builtin/branch.c:747 msgid "branch name required" msgstr "" -#: builtin/branch.c:926 +#: builtin/branch.c:723 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:931 +#: builtin/branch.c:728 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:938 +#: builtin/branch.c:735 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:738 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:956 +#: builtin/branch.c:753 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:961 +#: builtin/branch.c:758 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:965 +#: builtin/branch.c:762 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:972 +#: builtin/branch.c:769 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:984 +#: builtin/branch.c:781 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:988 +#: builtin/branch.c:785 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:994 +#: builtin/branch.c:791 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1008 +#: builtin/branch.c:805 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1014 +#: builtin/branch.c:811 msgid "" "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1017 +#: builtin/branch.c:814 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:1034 +#: builtin/branch.c:831 #, c-format msgid "" "\n" @@ -3628,12 +3639,12 @@ "\n" msgstr "" -#: builtin/branch.c:1035 +#: builtin/branch.c:832 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1036 +#: builtin/branch.c:833 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -3651,7 +3662,7 @@ msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:428 msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-" "p|<type>|--textconv) <object>" @@ -3661,31 +3672,31 @@ msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" msgstr "" -#: builtin/cat-file.c:407 +#: builtin/cat-file.c:466 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:408 +#: builtin/cat-file.c:467 msgid "show object type" msgstr "" -#: builtin/cat-file.c:409 +#: builtin/cat-file.c:468 msgid "show object size" msgstr "" -#: builtin/cat-file.c:411 +#: builtin/cat-file.c:470 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:412 +#: builtin/cat-file.c:471 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:414 +#: builtin/cat-file.c:473 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:416 +#: builtin/cat-file.c:475 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" @@ -3693,15 +3704,15 @@ msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:418 +#: builtin/cat-file.c:478 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:421 +#: builtin/cat-file.c:481 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:424 +#: builtin/cat-file.c:484 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" @@ -3733,7 +3744,7 @@ msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "" @@ -3819,6 +3830,8 @@ msgstr "" #: builtin/checkout-index.c:204 builtin/column.c:30 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181 msgid "string" msgstr "" @@ -3830,11 +3843,11 @@ msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:24 +#: builtin/checkout.c:25 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" @@ -3902,41 +3915,41 @@ msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:663 +#: builtin/checkout.c:661 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:670 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:673 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:677 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:679 builtin/checkout.c:1134 +#: builtin/checkout.c:677 builtin/checkout.c:1066 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:681 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:733 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:739 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3951,7 +3964,7 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:758 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -3968,197 +3981,198 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:794 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:798 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:825 builtin/checkout.c:1129 +#: builtin/checkout.c:823 builtin/checkout.c:1061 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1036 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1007 builtin/worktree.c:213 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1036 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1075 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1146 builtin/checkout.c:1150 +#: builtin/checkout.c:1078 builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162 -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094 +#: builtin/checkout.c:1097 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1102 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282 -#: builtin/worktree.c:284 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320 +#: builtin/worktree.c:322 msgid "branch" msgstr "" -#: builtin/checkout.c:1204 +#: builtin/checkout.c:1136 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1138 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1207 +#: builtin/checkout.c:1139 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1208 +#: builtin/checkout.c:1140 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1141 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1143 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1143 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1144 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1146 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1148 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1149 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1218 builtin/merge.c:227 +#: builtin/checkout.c:1150 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244 +#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250 msgid "style" msgstr "" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1152 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1223 +#: builtin/checkout.c:1155 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1157 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1227 +#: builtin/checkout.c:1159 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 -#: builtin/push.c:523 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558 +#: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1191 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1269 +#: builtin/checkout.c:1208 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1274 +#: builtin/checkout.c:1213 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1310 +#: builtin/checkout.c:1249 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1317 +#: builtin/checkout.c:1256 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1322 +#: builtin/checkout.c:1261 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1326 +#: builtin/checkout.c:1265 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:26 +#: builtin/clean.c:25 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:30 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:31 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:295 +#: builtin/clean.c:315 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -4166,7 +4180,7 @@ " - (empty) select nothing" msgstr "" -#: builtin/clean.c:299 +#: builtin/clean.c:319 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -4178,36 +4192,36 @@ " - (empty) finish selecting" msgstr "" -#: builtin/clean.c:515 +#: builtin/clean.c:535 #, c-format msgid "Huh (%s)?" msgstr "" -#: builtin/clean.c:657 +#: builtin/clean.c:677 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:694 +#: builtin/clean.c:714 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:715 +#: builtin/clean.c:735 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:756 +#: builtin/clean.c:776 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:781 +#: builtin/clean.c:801 msgid "Bye." msgstr "" -#: builtin/clean.c:789 +#: builtin/clean.c:809 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4218,68 +4232,68 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:816 +#: builtin/clean.c:836 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:817 +#: builtin/clean.c:837 msgid "What now" msgstr "" -#: builtin/clean.c:825 +#: builtin/clean.c:845 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:842 +#: builtin/clean.c:862 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:873 +#: builtin/clean.c:893 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:875 +#: builtin/clean.c:895 msgid "force" msgstr "" -#: builtin/clean.c:876 +#: builtin/clean.c:896 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:878 +#: builtin/clean.c:898 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182 msgid "pattern" msgstr "" -#: builtin/clean.c:880 +#: builtin/clean.c:900 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:881 +#: builtin/clean.c:901 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:883 +#: builtin/clean.c:903 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:901 +#: builtin/clean.c:921 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:905 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4293,7 +4307,7 @@ msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469 msgid "create a bare repository" msgstr "" @@ -4317,15 +4331,15 @@ msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:75 builtin/init-db.c:500 +#: builtin/clone.c:75 builtin/init-db.c:466 msgid "template-directory" msgstr "" -#: builtin/clone.c:76 builtin/init-db.c:501 +#: builtin/clone.c:76 builtin/init-db.c:467 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:78 +#: builtin/clone.c:78 builtin/submodule--helper.c:179 msgid "reference repository" msgstr "" @@ -4349,7 +4363,8 @@ msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 +#: builtin/pull.c:186 msgid "depth" msgstr "" @@ -4361,11 +4376,11 @@ msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:91 builtin/init-db.c:509 +#: builtin/clone.c:91 builtin/init-db.c:475 msgid "gitdir" msgstr "" -#: builtin/clone.c:92 builtin/init-db.c:510 +#: builtin/clone.c:92 builtin/init-db.c:476 msgid "separate git dir from working tree" msgstr "" @@ -4382,169 +4397,169 @@ msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: builtin/clone.c:240 +#: builtin/clone.c:302 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:244 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:247 +#: builtin/clone.c:310 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:312 builtin/diff.c:84 +#: builtin/clone.c:375 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:314 +#: builtin/clone.c:377 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:328 +#: builtin/clone.c:391 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:350 +#: builtin/clone.c:413 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:354 +#: builtin/clone.c:417 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:377 builtin/clone.c:551 +#: builtin/clone.c:442 builtin/clone.c:626 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:389 +#: builtin/clone.c:454 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:466 +#: builtin/clone.c:531 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:546 +#: builtin/clone.c:621 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:549 +#: builtin/clone.c:624 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:613 +#: builtin/clone.c:688 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:644 +#: builtin/clone.c:719 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:731 +#: builtin/clone.c:808 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:733 +#: builtin/clone.c:810 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:763 +#: builtin/clone.c:842 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:767 +#: builtin/clone.c:846 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:778 +#: builtin/clone.c:857 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:781 +#: builtin/clone.c:860 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:794 +#: builtin/clone.c:873 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:800 builtin/fetch.c:1160 +#: builtin/clone.c:879 builtin/fetch.c:1166 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:810 +#: builtin/clone.c:889 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:820 +#: builtin/clone.c:899 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193 -#: builtin/worktree.c:220 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224 +#: builtin/worktree.c:221 builtin/worktree.c:248 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:838 +#: builtin/clone.c:917 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:856 +#: builtin/clone.c:935 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:858 +#: builtin/clone.c:937 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:900 +#: builtin/clone.c:975 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:903 +#: builtin/clone.c:978 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:908 +#: builtin/clone.c:983 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:912 +#: builtin/clone.c:987 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:1036 builtin/clone.c:1044 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:972 +#: builtin/clone.c:1047 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4580,15 +4595,15 @@ msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4603,7 +4618,7 @@ " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4617,14 +4632,14 @@ " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:72 +#: builtin/commit.c:73 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:77 +#: builtin/commit.c:78 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4633,11 +4648,11 @@ "\n" msgstr "" -#: builtin/commit.c:84 +#: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:87 +#: builtin/commit.c:88 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4647,27 +4662,27 @@ "the remaining commits.\n" msgstr "" -#: builtin/commit.c:304 +#: builtin/commit.c:305 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:344 +#: builtin/commit.c:346 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:350 +#: builtin/commit.c:352 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:363 +#: builtin/commit.c:365 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" @@ -4801,7 +4816,7 @@ msgid "Error building trees" msgstr "" -#: builtin/commit.c:953 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -4868,7 +4883,7 @@ msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1209 builtin/tag.c:728 +#: builtin/commit.c:1209 builtin/tag.c:475 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -4877,32 +4892,33 @@ msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1324 builtin/commit.c:1603 +#: builtin/commit.c:1324 builtin/commit.c:1605 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1326 builtin/commit.c:1605 +#: builtin/commit.c:1326 builtin/commit.c:1607 msgid "show branch information" msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544 +#: builtin/worktree.c:423 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1331 builtin/commit.c:1609 +#: builtin/commit.c:1331 builtin/commit.c:1611 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1612 +#: builtin/commit.c:1334 builtin/commit.c:1614 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 -#: builtin/fast-export.c:983 builtin/tag.c:603 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1615 +#: builtin/commit.c:1337 builtin/commit.c:1617 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" @@ -4910,7 +4926,7 @@ msgid "show ignored files" msgstr "" -#: builtin/commit.c:1341 parse-options.h:152 +#: builtin/commit.c:1341 parse-options.h:155 msgid "when" msgstr "" @@ -4940,179 +4956,178 @@ msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1573 +#: builtin/commit.c:1575 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1574 +#: builtin/commit.c:1576 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1578 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1577 builtin/tag.c:601 +#: builtin/commit.c:1579 builtin/tag.c:351 msgid "read message from file" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1580 msgid "author" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1580 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1579 builtin/gc.c:280 +#: builtin/commit.c:1581 builtin/gc.c:326 msgid "date" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1581 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 -#: builtin/notes.c:554 builtin/tag.c:599 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392 +#: builtin/notes.c:555 builtin/tag.c:349 msgid "message" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1582 msgid "commit message" msgstr "" -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 -#: builtin/tag.c:622 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1583 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1584 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1586 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1587 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1589 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1590 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1591 msgid "default" msgstr "" -#: builtin/commit.c:1589 builtin/tag.c:604 +#: builtin/commit.c:1591 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1592 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156 +#: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1597 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1598 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1599 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1600 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1601 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1602 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1603 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1604 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1615 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1616 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1621 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1623 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1650 +#: builtin/commit.c:1652 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1696 +#: builtin/commit.c:1698 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1703 +#: builtin/commit.c:1705 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1722 +#: builtin/commit.c:1724 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1733 +#: builtin/commit.c:1735 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1738 +#: builtin/commit.c:1740 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1786 +#: builtin/commit.c:1788 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5123,119 +5138,119 @@ msgid "git config [<options>]" msgstr "" -#: builtin/config.c:53 +#: builtin/config.c:54 msgid "Config file location" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:55 msgid "use global config file" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "use system config file" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use repository config file" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use given config file" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "blob-id" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "Action" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a section: name" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "list all" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "open an editor" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "Type" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "value is decimal number" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "Other" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "terminate values with NUL byte" msgstr "" @@ -5243,15 +5258,15 @@ msgid "show variable names only" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:83 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:316 +#: builtin/config.c:303 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:457 +#: builtin/config.c:441 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5261,16 +5276,16 @@ "#\temail = %s\n" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:575 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/count-objects.c:55 +#: builtin/count-objects.c:77 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:65 +#: builtin/count-objects.c:87 msgid "print sizes in human readable format" msgstr "" @@ -5297,7 +5312,7 @@ msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:250 builtin/log.c:452 +#: builtin/describe.c:250 builtin/log.c:459 #, c-format msgid "Not a valid object name %s" msgstr "" @@ -5384,7 +5399,7 @@ msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:314 msgid "show abbreviated commit object as fallback" msgstr "" @@ -5437,344 +5452,344 @@ msgid "unhandled object '%s' given." msgstr "" -#: builtin/fast-export.c:24 +#: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:979 +#: builtin/fast-export.c:980 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:981 +#: builtin/fast-export.c:982 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:985 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:988 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:989 +#: builtin/fast-export.c:990 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:991 +#: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:993 +#: builtin/fast-export.c:994 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:995 +#: builtin/fast-export.c:996 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:997 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:998 msgid "refspec" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:999 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1000 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:19 +#: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 builtin/pull.c:162 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:91 +#: builtin/fetch.c:92 builtin/pull.c:165 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 builtin/pull.c:168 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:94 +#: builtin/fetch.c:95 builtin/pull.c:170 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:96 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 builtin/pull.c:172 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:102 +#: builtin/fetch.c:103 builtin/pull.c:175 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 builtin/pull.c:178 msgid "on-demand" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:105 builtin/pull.c:179 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:108 +#: builtin/fetch.c:109 builtin/pull.c:184 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:110 +#: builtin/fetch.c:111 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:113 +#: builtin/fetch.c:114 builtin/pull.c:187 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 builtin/pull.c:190 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:117 builtin/log.c:1208 +#: builtin/fetch.c:118 builtin/log.c:1233 msgid "dir" msgstr "" -#: builtin/fetch.c:118 +#: builtin/fetch.c:119 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:121 +#: builtin/fetch.c:122 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 builtin/pull.c:193 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:124 +#: builtin/fetch.c:125 builtin/pull.c:195 msgid "refmap" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 builtin/pull.c:196 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:377 +#: builtin/fetch.c:378 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:457 +#: builtin/fetch.c:458 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:462 +#: builtin/fetch.c:463 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:476 +#: builtin/fetch.c:477 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:477 builtin/fetch.c:563 +#: builtin/fetch.c:478 builtin/fetch.c:566 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:489 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 +#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:514 +#: builtin/fetch.c:515 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:559 +#: builtin/fetch.c:561 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:559 +#: builtin/fetch.c:561 msgid "forced update" msgstr "" -#: builtin/fetch.c:565 +#: builtin/fetch.c:568 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:599 builtin/fetch.c:832 +#: builtin/fetch.c:602 builtin/fetch.c:843 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:608 +#: builtin/fetch.c:611 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:626 +#: builtin/fetch.c:629 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:714 builtin/fetch.c:797 +#: builtin/fetch.c:716 builtin/fetch.c:808 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:725 +#: builtin/fetch.c:727 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:777 +#: builtin/fetch.c:779 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:778 +#: builtin/fetch.c:780 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:802 +#: builtin/fetch.c:812 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:803 builtin/remote.c:1057 +#: builtin/fetch.c:813 builtin/remote.c:1040 msgid "(none)" msgstr "" -#: builtin/fetch.c:822 +#: builtin/fetch.c:833 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:841 +#: builtin/fetch.c:852 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:844 +#: builtin/fetch.c:855 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:900 +#: builtin/fetch.c:911 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1063 +#: builtin/fetch.c:1072 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1065 builtin/remote.c:90 +#: builtin/fetch.c:1074 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1083 +#: builtin/fetch.c:1092 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1106 +#: builtin/fetch.c:1115 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1148 +#: builtin/fetch.c:1157 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1150 +#: builtin/fetch.c:1159 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1173 +#: builtin/fetch.c:1179 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1175 +#: builtin/fetch.c:1181 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1186 +#: builtin/fetch.c:1192 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1200 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:13 +#: builtin/fmt-merge-msg.c:14 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:667 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:670 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:673 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:676 +#: builtin/fmt-merge-msg.c:674 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:675 msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:9 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "" @@ -5790,27 +5805,27 @@ msgid "git for-each-ref [--contains [<object>]]" msgstr "" -#: builtin/for-each-ref.c:1098 +#: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1100 +#: builtin/for-each-ref.c:29 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1102 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1104 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:1107 +#: builtin/for-each-ref.c:36 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1108 +#: builtin/for-each-ref.c:37 builtin/tag.c:372 msgid "format to use for the output" msgstr "" @@ -5830,43 +5845,43 @@ msgid "print only refs which contain the commit" msgstr "" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:156 builtin/prune.c:140 msgid "Checking connectivity" msgstr "" -#: builtin/fsck.c:548 +#: builtin/fsck.c:486 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:611 +#: builtin/fsck.c:553 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:617 +#: builtin/fsck.c:559 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:560 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:561 msgid "report tags" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:562 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:621 +#: builtin/fsck.c:563 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:622 +#: builtin/fsck.c:564 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:623 +#: builtin/fsck.c:565 msgid "also consider packs and alternate objects" msgstr "" @@ -5874,32 +5889,32 @@ msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:624 +#: builtin/fsck.c:567 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:626 +#: builtin/fsck.c:569 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:627 builtin/prune.c:107 +#: builtin/fsck.c:570 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:677 +#: builtin/fsck.c:631 msgid "Checking objects" msgstr "" -#: builtin/gc.c:24 +#: builtin/gc.c:25 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:67 +#: builtin/gc.c:72 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:112 +#: builtin/gc.c:139 #, c-format msgid "insanely long object directory %.*s" msgstr "" @@ -5914,44 +5929,44 @@ "%s" msgstr "" -#: builtin/gc.c:281 +#: builtin/gc.c:327 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:283 +#: builtin/gc.c:329 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:284 +#: builtin/gc.c:330 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:285 +#: builtin/gc.c:331 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:327 +#: builtin/gc.c:373 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:329 +#: builtin/gc.c:375 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:330 +#: builtin/gc.c:376 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:348 +#: builtin/gc.c:397 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:376 +#: builtin/gc.c:441 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5985,195 +6000,195 @@ msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:638 +#: builtin/grep.c:633 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:640 +#: builtin/grep.c:635 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:642 +#: builtin/grep.c:637 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:639 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:647 +#: builtin/grep.c:642 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:649 +#: builtin/grep.c:644 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:651 +#: builtin/grep.c:646 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:648 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:650 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:658 +#: builtin/grep.c:653 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:660 +#: builtin/grep.c:655 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:659 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:667 +#: builtin/grep.c:662 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:665 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:668 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:671 msgid "show line numbers" msgstr "" -#: builtin/grep.c:677 +#: builtin/grep.c:672 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:678 +#: builtin/grep.c:673 msgid "show filenames" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:675 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:677 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:679 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:687 +#: builtin/grep.c:682 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:689 +#: builtin/grep.c:684 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:691 +#: builtin/grep.c:686 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:692 +#: builtin/grep.c:687 msgid "highlight matches" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:689 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:696 +#: builtin/grep.c:691 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:699 +#: builtin/grep.c:694 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:697 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:704 +#: builtin/grep.c:699 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:700 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:703 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:705 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:708 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:715 +#: builtin/grep.c:710 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:717 +#: builtin/grep.c:712 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:729 +#: builtin/grep.c:724 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:731 +#: builtin/grep.c:726 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:728 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:732 msgid "pager" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:732 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:735 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:808 +#: builtin/grep.c:793 msgid "no pattern given." msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:851 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:877 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:882 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:885 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:893 msgid "both --cached and trees are given." msgstr "" @@ -6187,7 +6202,7 @@ msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:92 builtin/tag.c:612 +#: builtin/hash-object.c:92 msgid "type" msgstr "" @@ -6258,207 +6273,207 @@ msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:215 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:227 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:354 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:371 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:379 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:428 +#: builtin/help.c:411 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:429 +#: builtin/help.c:412 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:430 +#: builtin/help.c:413 msgid "A Git glossary" msgstr "" -#: builtin/help.c:431 +#: builtin/help.c:414 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:432 +#: builtin/help.c:415 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:433 +#: builtin/help.c:416 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:434 +#: builtin/help.c:417 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:435 +#: builtin/help.c:418 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:447 +#: builtin/help.c:430 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:468 builtin/help.c:485 +#: builtin/help.c:451 builtin/help.c:468 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:501 +#: builtin/help.c:484 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:151 +#: builtin/index-pack.c:152 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:201 +#: builtin/index-pack.c:202 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:267 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:276 +#: builtin/index-pack.c:277 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:278 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:289 +#: builtin/index-pack.c:290 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:296 +#: builtin/index-pack.c:297 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:313 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:331 +#: builtin/index-pack.c:332 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:334 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:351 +#: builtin/index-pack.c:352 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:472 +#: builtin/index-pack.c:473 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:521 +#: builtin/index-pack.c:522 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:529 +#: builtin/index-pack.c:530 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:568 +#: builtin/index-pack.c:569 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:571 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:596 +#: builtin/index-pack.c:597 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 -#: builtin/index-pack.c:805 builtin/index-pack.c:814 +#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 +#: builtin/index-pack.c:806 builtin/index-pack.c:815 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:745 builtin/pack-objects.c:162 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:811 +#: builtin/index-pack.c:812 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:826 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:839 +#: builtin/index-pack.c:840 #, c-format msgid "invalid %s" msgstr "" @@ -6572,7 +6587,7 @@ msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1663 #, c-format msgid "no threads support, ignoring %s" msgstr "" @@ -6601,85 +6616,85 @@ msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1623 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 +#: builtin/index-pack.c:1675 builtin/index-pack.c:1678 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1694 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1703 +#: builtin/index-pack.c:1708 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1721 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1724 +#: builtin/index-pack.c:1729 msgid "--verify with no packfile name given" msgstr "" -#: builtin/init-db.c:67 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:73 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:97 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:102 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:106 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:110 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:144 +#: builtin/init-db.c:118 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:157 +#: builtin/init-db.c:131 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" -#: builtin/init-db.c:343 builtin/init-db.c:346 +#: builtin/init-db.c:309 builtin/init-db.c:312 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:374 +#: builtin/init-db.c:340 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:377 +#: builtin/init-db.c:343 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -6687,55 +6702,55 @@ #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:433 +#: builtin/init-db.c:399 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:434 +#: builtin/init-db.c:400 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:434 +#: builtin/init-db.c:400 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:435 +#: builtin/init-db.c:401 msgid " shared" msgstr "" -#: builtin/init-db.c:482 +#: builtin/init-db.c:448 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:505 +#: builtin/init-db.c:471 msgid "permissions" msgstr "" -#: builtin/init-db.c:506 +#: builtin/init-db.c:472 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:540 builtin/init-db.c:545 +#: builtin/init-db.c:506 builtin/init-db.c:511 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:549 +#: builtin/init-db.c:515 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:570 +#: builtin/init-db.c:536 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:598 +#: builtin/init-db.c:564 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6758,146 +6773,146 @@ msgid "trailer(s) to add" msgstr "" -#: builtin/log.c:41 +#: builtin/log.c:43 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:42 +#: builtin/log.c:44 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:81 +#: builtin/log.c:83 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:127 +#: builtin/log.c:131 msgid "suppress diff output" msgstr "" -#: builtin/log.c:128 +#: builtin/log.c:132 msgid "show source" msgstr "" -#: builtin/log.c:129 +#: builtin/log.c:133 msgid "Use mail map file" msgstr "" -#: builtin/log.c:130 +#: builtin/log.c:134 msgid "decorate options" msgstr "" -#: builtin/log.c:133 +#: builtin/log.c:137 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:229 +#: builtin/log.c:233 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:458 +#: builtin/log.c:465 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:472 builtin/log.c:564 +#: builtin/log.c:479 builtin/log.c:572 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:588 +#: builtin/log.c:596 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:689 +#: builtin/log.c:714 msgid "format.headers without value" msgstr "" -#: builtin/log.c:773 +#: builtin/log.c:798 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:789 +#: builtin/log.c:813 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:803 +#: builtin/log.c:827 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:813 +#: builtin/log.c:837 msgid "Not a range." msgstr "" -#: builtin/log.c:919 +#: builtin/log.c:943 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:998 +#: builtin/log.c:1022 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1026 +#: builtin/log.c:1050 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1071 +#: builtin/log.c:1095 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1211 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1189 +#: builtin/log.c:1214 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1193 +#: builtin/log.c:1218 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1195 +#: builtin/log.c:1220 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1197 +#: builtin/log.c:1222 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1198 +#: builtin/log.c:1223 msgid "sfx" msgstr "" -#: builtin/log.c:1199 +#: builtin/log.c:1224 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1201 +#: builtin/log.c:1226 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1203 +#: builtin/log.c:1228 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1205 +#: builtin/log.c:1230 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1208 +#: builtin/log.c:1233 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1211 +#: builtin/log.c:1236 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1239 msgid "don't output binary diffs" msgstr "" @@ -6905,135 +6920,135 @@ msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1243 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1218 +#: builtin/log.c:1245 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1220 +#: builtin/log.c:1247 msgid "Messaging" msgstr "" -#: builtin/log.c:1221 +#: builtin/log.c:1248 msgid "header" msgstr "" -#: builtin/log.c:1222 +#: builtin/log.c:1249 msgid "add email header" msgstr "" -#: builtin/log.c:1223 builtin/log.c:1225 +#: builtin/log.c:1250 builtin/log.c:1252 msgid "email" msgstr "" -#: builtin/log.c:1223 +#: builtin/log.c:1250 msgid "add To: header" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1252 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1227 +#: builtin/log.c:1254 msgid "ident" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1255 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1230 +#: builtin/log.c:1257 msgid "message-id" msgstr "" -#: builtin/log.c:1231 +#: builtin/log.c:1258 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1232 builtin/log.c:1235 +#: builtin/log.c:1259 builtin/log.c:1262 msgid "boundary" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1260 msgid "attach the patch" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1263 msgid "inline the patch" msgstr "" -#: builtin/log.c:1240 +#: builtin/log.c:1267 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1269 msgid "signature" msgstr "" -#: builtin/log.c:1243 +#: builtin/log.c:1270 msgid "add a signature" msgstr "" -#: builtin/log.c:1245 +#: builtin/log.c:1272 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1246 +#: builtin/log.c:1273 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1335 +#: builtin/log.c:1362 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1337 +#: builtin/log.c:1364 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1345 +#: builtin/log.c:1372 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1347 +#: builtin/log.c:1374 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1349 +#: builtin/log.c:1376 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1372 +#: builtin/log.c:1401 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1374 +#: builtin/log.c:1403 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1500 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1535 +#: builtin/log.c:1563 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1583 +#: builtin/log.c:1611 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1637 +#: builtin/log.c:1665 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 +#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690 #, c-format msgid "Unknown commit %s" msgstr "" @@ -7134,35 +7149,35 @@ msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -7197,31 +7212,31 @@ msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:193 builtin/pull.c:119 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:196 +#: builtin/merge.c:196 builtin/pull.c:122 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:197 +#: builtin/merge.c:197 builtin/pull.c:125 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:199 +#: builtin/merge.c:199 builtin/pull.c:128 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:202 +#: builtin/merge.c:202 builtin/pull.c:131 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:204 builtin/pull.c:134 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:206 +#: builtin/merge.c:206 builtin/pull.c:137 msgid "edit message before committing" msgstr "" @@ -7229,7 +7244,7 @@ msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:209 +#: builtin/merge.c:209 builtin/pull.c:143 msgid "abort if fast-forward is not possible" msgstr "" @@ -7237,19 +7252,20 @@ msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 +#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148 +#: builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:215 +#: builtin/merge.c:215 builtin/pull.c:149 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:216 +#: builtin/merge.c:216 builtin/pull.c:152 msgid "option=value" msgstr "" -#: builtin/merge.c:217 +#: builtin/merge.c:217 builtin/pull.c:153 msgid "option for selected merge strategy" msgstr "" @@ -7287,7 +7303,7 @@ msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 #: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" @@ -7386,72 +7402,72 @@ msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1081 +#: builtin/merge.c:1079 #, c-format msgid "could not close '%s'" msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1206 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1224 +#: builtin/merge.c:1222 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1231 +#: builtin/merge.c:1229 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1234 +#: builtin/merge.c:1232 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1243 +#: builtin/merge.c:1241 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1251 +#: builtin/merge.c:1249 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1268 +#: builtin/merge.c:1266 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1270 +#: builtin/merge.c:1268 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1276 +#: builtin/merge.c:1274 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1278 +#: builtin/merge.c:1276 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1333 +#: builtin/merge.c:1331 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1336 +#: builtin/merge.c:1334 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1337 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1342 +#: builtin/merge.c:1340 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" @@ -7461,46 +7477,46 @@ msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1462 +#: builtin/merge.c:1460 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1469 +#: builtin/merge.c:1467 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1501 +#: builtin/merge.c:1499 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1522 builtin/merge.c:1601 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1528 +#: builtin/merge.c:1526 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1594 +#: builtin/merge.c:1592 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1596 +#: builtin/merge.c:1594 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1603 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1617 +#: builtin/merge.c:1615 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7686,326 +7702,326 @@ msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:255 +#: builtin/name-rev.c:251 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:256 +#: builtin/name-rev.c:252 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:253 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:309 +#: builtin/name-rev.c:305 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:306 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:308 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:310 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:311 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:312 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:322 +#: builtin/name-rev.c:318 msgid "dereference tags in the input (internal use)" msgstr "" -#: builtin/notes.c:24 +#: builtin/notes.c:25 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" -#: builtin/notes.c:40 +#: builtin/notes.c:41 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:45 +#: builtin/notes.c:46 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:50 +#: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:56 +#: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:61 +#: builtin/notes.c:62 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:66 +#: builtin/notes.c:67 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:71 +#: builtin/notes.c:72 msgid "git notes merge [<options>] <notes-ref>" msgstr "" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:78 +#: builtin/notes.c:79 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:83 +#: builtin/notes.c:84 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:88 +#: builtin/notes.c:89 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:146 +#: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:150 +#: builtin/notes.c:151 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:158 +#: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:173 builtin/tag.c:477 +#: builtin/notes.c:174 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:192 +#: builtin/notes.c:193 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:201 +#: builtin/notes.c:202 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:203 +#: builtin/notes.c:204 #, c-format msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:231 builtin/tag.c:693 +#: builtin/notes.c:232 builtin/tag.c:440 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:233 builtin/tag.c:696 +#: builtin/notes.c:234 builtin/tag.c:443 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 -#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 -#: builtin/notes.c:854 builtin/tag.c:709 +#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 +#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 +#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 +#: builtin/notes.c:877 builtin/tag.c:456 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:255 +#: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:259 +#: builtin/notes.c:260 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 -#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 -#: builtin/notes.c:919 +#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490 +#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646 +#: builtin/notes.c:942 msgid "too many parameters" msgstr "" -#: builtin/notes.c:371 builtin/notes.c:658 +#: builtin/notes.c:372 builtin/notes.c:659 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:392 builtin/notes.c:555 +#: builtin/notes.c:393 builtin/notes.c:556 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:395 builtin/notes.c:558 +#: builtin/notes.c:396 builtin/notes.c:559 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:398 builtin/notes.c:561 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:401 builtin/notes.c:564 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:404 builtin/notes.c:567 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:405 builtin/notes.c:476 +#: builtin/notes.c:406 builtin/notes.c:477 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:430 +#: builtin/notes.c:431 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:445 builtin/notes.c:524 +#: builtin/notes.c:446 builtin/notes.c:525 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:477 +#: builtin/notes.c:478 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:479 +#: builtin/notes.c:480 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:497 +#: builtin/notes.c:498 msgid "too few parameters" msgstr "" -#: builtin/notes.c:518 +#: builtin/notes.c:519 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:530 +#: builtin/notes.c:531 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:582 +#: builtin/notes.c:583 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:750 +#: builtin/notes.c:764 msgid "General options" msgstr "" -#: builtin/notes.c:752 +#: builtin/notes.c:766 msgid "Merge options" msgstr "" -#: builtin/notes.c:754 +#: builtin/notes.c:768 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "" -#: builtin/notes.c:756 +#: builtin/notes.c:770 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:758 +#: builtin/notes.c:772 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:760 +#: builtin/notes.c:774 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:762 +#: builtin/notes.c:776 msgid "abort notes merge" msgstr "" @@ -8014,28 +8030,28 @@ msgid "A notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:857 +#: builtin/notes.c:880 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:892 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:872 +#: builtin/notes.c:895 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:953 +#: builtin/notes.c:976 msgid "notes-ref" msgstr "" -#: builtin/notes.c:954 +#: builtin/notes.c:977 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:989 builtin/remote.c:1618 +#: builtin/notes.c:1012 builtin/remote.c:1647 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -8077,143 +8093,143 @@ msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2602 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2604 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2606 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2609 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2610 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2611 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2614 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2616 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2618 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2620 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2622 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2624 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2626 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2628 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2630 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2632 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2634 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2636 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2638 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2641 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2644 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2647 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2650 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2652 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2654 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2672 parse-options.h:139 +#: builtin/pack-objects.c:2655 parse-options.h:142 msgid "time" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2656 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2659 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2661 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2663 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2665 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2667 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2669 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2688 +#: builtin/pack-objects.c:2671 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2779 +#: builtin/pack-objects.c:2762 msgid "Counting objects" msgstr "" @@ -8241,15 +8257,15 @@ msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:105 builtin/worktree.c:112 +#: builtin/prune.c:105 builtin/worktree.c:124 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:106 builtin/worktree.c:113 +#: builtin/prune.c:106 builtin/worktree.c:125 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:109 builtin/worktree.c:115 +#: builtin/prune.c:109 builtin/worktree.c:127 msgid "expire objects older than <time>" msgstr "" @@ -8269,7 +8285,7 @@ msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/revert.c:105 +#: builtin/pull.c:140 builtin/revert.c:105 msgid "allow fast-forward" msgstr "" @@ -8389,25 +8405,25 @@ msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/push.c:14 +#: builtin/push.c:16 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:85 +#: builtin/push.c:88 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:95 +#: builtin/push.c:98 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:139 +#: builtin/push.c:142 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:142 +#: builtin/push.c:145 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -8422,7 +8438,7 @@ "%s" msgstr "" -#: builtin/push.c:157 +#: builtin/push.c:160 #, c-format msgid "" "You are not currently on a branch.\n" @@ -8432,7 +8448,7 @@ " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:171 +#: builtin/push.c:174 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -8441,13 +8457,13 @@ " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:179 +#: builtin/push.c:182 #, c-format msgid "" "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:182 +#: builtin/push.c:185 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -8455,7 +8471,7 @@ "to update which remote branch." msgstr "" -#: builtin/push.c:205 +#: builtin/push.c:208 msgid "" "push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -8480,12 +8496,12 @@ "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:272 +#: builtin/push.c:275 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:279 +#: builtin/push.c:282 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -8493,7 +8509,7 @@ "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:285 +#: builtin/push.c:288 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -8501,7 +8517,7 @@ "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:291 +#: builtin/push.c:294 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -8510,33 +8526,33 @@ "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:301 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:301 +#: builtin/push.c:304 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:360 +#: builtin/push.c:363 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:364 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:394 +#: builtin/push.c:397 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:395 +#: builtin/push.c:398 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8549,55 +8565,55 @@ " git push <name>\n" msgstr "" -#: builtin/push.c:410 +#: builtin/push.c:413 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:411 +#: builtin/push.c:414 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:416 +#: builtin/push.c:419 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:417 +#: builtin/push.c:420 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:422 +#: builtin/push.c:425 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:502 +#: builtin/push.c:537 msgid "repository" msgstr "" -#: builtin/push.c:503 +#: builtin/push.c:538 builtin/send-pack.c:161 msgid "push all refs" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:539 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "" -#: builtin/push.c:506 +#: builtin/push.c:541 msgid "delete refs" msgstr "" -#: builtin/push.c:507 +#: builtin/push.c:542 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:510 +#: builtin/push.c:545 builtin/send-pack.c:164 msgid "force updates" msgstr "" -#: builtin/push.c:512 +#: builtin/push.c:547 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:513 +#: builtin/push.c:548 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "" @@ -8605,47 +8621,48 @@ msgid "check|on-demand|no" msgstr "" -#: builtin/push.c:516 +#: builtin/push.c:551 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:518 +#: builtin/push.c:553 builtin/send-pack.c:169 msgid "use thin pack" msgstr "" -#: builtin/push.c:519 builtin/push.c:520 +#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158 +#: builtin/send-pack.c:159 msgid "receive pack program" msgstr "" -#: builtin/push.c:521 +#: builtin/push.c:556 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:524 +#: builtin/push.c:559 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:526 +#: builtin/push.c:561 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:527 +#: builtin/push.c:562 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:529 +#: builtin/push.c:565 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:530 +#: builtin/push.c:567 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:539 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:541 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -8725,7 +8742,7 @@ msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:547 builtin/reflog.c:552 +#: builtin/reflog.c:545 builtin/reflog.c:550 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -8740,15 +8757,15 @@ "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:14 builtin/remote.c:33 +#: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:15 builtin/remote.c:38 +#: builtin/remote.c:15 builtin/remote.c:39 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:16 builtin/remote.c:43 +#: builtin/remote.c:16 builtin/remote.c:44 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" @@ -8773,143 +8790,143 @@ msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:75 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:23 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:28 +#: builtin/remote.c:29 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:88 +#: builtin/remote.c:94 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:120 +#: builtin/remote.c:126 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:137 +#: builtin/remote.c:143 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:153 +#: builtin/remote.c:159 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:155 +#: builtin/remote.c:161 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:158 +#: builtin/remote.c:164 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:160 +#: builtin/remote.c:166 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:161 +#: builtin/remote.c:167 msgid "master branch" msgstr "" -#: builtin/remote.c:162 +#: builtin/remote.c:168 msgid "push|fetch" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:169 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:175 +#: builtin/remote.c:181 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:177 +#: builtin/remote.c:183 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:187 builtin/remote.c:640 +#: builtin/remote.c:193 builtin/remote.c:643 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:191 builtin/remote.c:644 +#: builtin/remote.c:197 builtin/remote.c:647 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:235 +#: builtin/remote.c:241 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:335 +#: builtin/remote.c:341 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:436 builtin/remote.c:444 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "" -#: builtin/remote.c:448 +#: builtin/remote.c:454 msgid "(delete)" msgstr "" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606 #, c-format msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 +#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:650 +#: builtin/remote.c:653 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:656 builtin/remote.c:844 +#: builtin/remote.c:659 builtin/remote.c:827 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:671 +#: builtin/remote.c:674 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8917,27 +8934,27 @@ "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:677 +#: builtin/remote.c:680 #, c-format msgid "Could not append '%s'" msgstr "" -#: builtin/remote.c:688 +#: builtin/remote.c:691 #, c-format msgid "Could not set '%s'" msgstr "" -#: builtin/remote.c:710 +#: builtin/remote.c:713 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:744 +#: builtin/remote.c:747 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:830 +#: builtin/remote.c:813 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8947,228 +8964,228 @@ msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:945 +#: builtin/remote.c:928 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:948 +#: builtin/remote.c:931 msgid " tracked" msgstr "" -#: builtin/remote.c:950 +#: builtin/remote.c:933 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:952 +#: builtin/remote.c:935 msgid " ???" msgstr "" -#: builtin/remote.c:993 +#: builtin/remote.c:976 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1000 +#: builtin/remote.c:983 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1003 +#: builtin/remote.c:986 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1004 +#: builtin/remote.c:987 msgid " and with remote" msgstr "" -#: builtin/remote.c:1006 +#: builtin/remote.c:989 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1007 +#: builtin/remote.c:990 msgid " and with remote" msgstr "" -#: builtin/remote.c:1053 +#: builtin/remote.c:1036 msgid "create" msgstr "" -#: builtin/remote.c:1056 +#: builtin/remote.c:1039 msgid "delete" msgstr "" -#: builtin/remote.c:1060 +#: builtin/remote.c:1043 msgid "up to date" msgstr "" -#: builtin/remote.c:1063 +#: builtin/remote.c:1046 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1066 +#: builtin/remote.c:1049 msgid "local out of date" msgstr "" -#: builtin/remote.c:1073 +#: builtin/remote.c:1056 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1076 +#: builtin/remote.c:1059 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1080 +#: builtin/remote.c:1063 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1083 +#: builtin/remote.c:1066 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1151 +#: builtin/remote.c:1134 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1178 +#: builtin/remote.c:1161 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1162 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1180 builtin/remote.c:1331 +#: builtin/remote.c:1163 builtin/remote.c:1314 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1189 builtin/remote.c:1191 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1199 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1211 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1214 builtin/remote.c:1241 +#: builtin/remote.c:1197 builtin/remote.c:1224 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1223 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1231 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1238 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1261 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1276 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1278 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1288 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1296 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1316 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1317 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1327 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1328 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1351 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1354 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1399 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1465 builtin/remote.c:1539 +#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1485 +#: builtin/remote.c:1461 msgid "add branch" msgstr "" -#: builtin/remote.c:1492 +#: builtin/remote.c:1468 msgid "no remote specified" msgstr "" @@ -9185,37 +9202,37 @@ msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1514 +#: builtin/remote.c:1541 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1516 +#: builtin/remote.c:1543 msgid "add URL" msgstr "" -#: builtin/remote.c:1518 +#: builtin/remote.c:1545 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1525 +#: builtin/remote.c:1552 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1565 +#: builtin/remote.c:1592 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1573 +#: builtin/remote.c:1600 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1575 +#: builtin/remote.c:1602 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1589 +#: builtin/remote.c:1616 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -9291,7 +9308,7 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:377 +#: builtin/repack.c:381 #, c-format msgid "removing '%s' failed" msgstr "" @@ -9385,7 +9402,7 @@ "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" -#: builtin/rerere.c:57 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "" @@ -9518,19 +9535,19 @@ msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-parse.c:361 +#: builtin/rev-parse.c:358 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:366 +#: builtin/rev-parse.c:363 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:365 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:371 +#: builtin/rev-parse.c:368 msgid "output in stuck long form" msgstr "" @@ -9769,7 +9786,7 @@ msgid "Linewrap output" msgstr "" -#: builtin/show-branch.c:9 +#: builtin/show-branch.c:10 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -9777,71 +9794,71 @@ "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -#: builtin/show-branch.c:13 +#: builtin/show-branch.c:14 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:640 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:642 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:644 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:646 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:648 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:649 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:651 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:653 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:655 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:657 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:659 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:662 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:683 +#: builtin/show-branch.c:664 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:685 +#: builtin/show-branch.c:666 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:688 +#: builtin/show-branch.c:669 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:689 +#: builtin/show-branch.c:670 msgid "show <n> most recent ref-log entries starting at base" msgstr "" @@ -9855,35 +9872,35 @@ msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:171 +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:175 builtin/show-ref.c:177 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:181 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:187 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -9997,21 +10014,21 @@ msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "" -#: builtin/tag.c:22 +#: builtin/tag.c:23 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "git tag -d <tagname>..." msgstr "" @@ -10021,31 +10038,31 @@ "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -v <tagname>..." msgstr "" -#: builtin/tag.c:301 +#: builtin/tag.c:80 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:306 +#: builtin/tag.c:85 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:321 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:333 +#: builtin/tag.c:112 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:343 +#: builtin/tag.c:122 #, c-format msgid "" "\n" @@ -10054,7 +10071,7 @@ "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:347 +#: builtin/tag.c:126 #, c-format msgid "" "\n" @@ -10064,68 +10081,68 @@ "want to.\n" msgstr "" -#: builtin/tag.c:428 +#: builtin/tag.c:199 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:201 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:455 +#: builtin/tag.c:226 msgid "bad object type." msgstr "" -#: builtin/tag.c:468 +#: builtin/tag.c:239 msgid "tag header too big." msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:275 msgid "no tag message?" msgstr "" -#: builtin/tag.c:510 +#: builtin/tag.c:281 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:589 +#: builtin/tag.c:339 msgid "list tag names" msgstr "" -#: builtin/tag.c:591 +#: builtin/tag.c:341 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:593 +#: builtin/tag.c:343 msgid "delete tags" msgstr "" -#: builtin/tag.c:594 +#: builtin/tag.c:344 msgid "verify tags" msgstr "" -#: builtin/tag.c:596 +#: builtin/tag.c:346 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:598 +#: builtin/tag.c:348 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:600 +#: builtin/tag.c:350 msgid "tag message" msgstr "" -#: builtin/tag.c:602 +#: builtin/tag.c:352 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:606 +#: builtin/tag.c:356 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:607 +#: builtin/tag.c:357 msgid "replace the tag if exists" msgstr "" @@ -10133,15 +10150,15 @@ msgid "create a reflog" msgstr "" -#: builtin/tag.c:609 +#: builtin/tag.c:360 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:610 +#: builtin/tag.c:361 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:617 builtin/tag.c:623 +#: builtin/tag.c:362 builtin/tag.c:363 msgid "print only tags that contain the commit" msgstr "" @@ -10153,23 +10170,23 @@ msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:629 +#: builtin/tag.c:370 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:655 +#: builtin/tag.c:399 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:674 +#: builtin/tag.c:419 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:676 +#: builtin/tag.c:421 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:678 +#: builtin/tag.c:423 msgid "--points-at option is only allowed with -l." msgstr "" @@ -10177,30 +10194,30 @@ msgid "--merged and --no-merged option are only allowed with -l" msgstr "" -#: builtin/tag.c:686 +#: builtin/tag.c:433 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:706 +#: builtin/tag.c:453 msgid "too many params" msgstr "" -#: builtin/tag.c:712 +#: builtin/tag.c:459 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:717 +#: builtin/tag.c:464 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:741 +#: builtin/tag.c:489 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:489 +#: builtin/unpack-objects.c:490 msgid "Unpacking objects" msgstr "" @@ -10398,19 +10415,19 @@ msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:359 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:361 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:362 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "" @@ -10426,7 +10443,7 @@ msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" -#: builtin/verify-commit.c:75 +#: builtin/verify-commit.c:72 msgid "print commit contents" msgstr "" @@ -10450,7 +10467,7 @@ msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" -#: builtin/verify-tag.c:73 +#: builtin/verify-tag.c:83 msgid "print tag contents" msgstr "" @@ -10458,7 +10475,7 @@ msgid "git worktree add [<options>] <path> [<branch>]" msgstr "" -#: builtin/worktree.c:12 +#: builtin/worktree.c:16 msgid "git worktree prune [<options>]" msgstr "" @@ -10466,42 +10483,42 @@ msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:27 +#: builtin/worktree.c:39 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:33 +#: builtin/worktree.c:45 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:38 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:49 +#: builtin/worktree.c:61 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:65 +#: builtin/worktree.c:77 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "failed to remove: %s" msgstr "" -#: builtin/worktree.c:186 +#: builtin/worktree.c:201 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:207 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "" @@ -10511,19 +10528,19 @@ msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:281 +#: builtin/worktree.c:319 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:283 +#: builtin/worktree.c:321 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:285 +#: builtin/worktree.c:323 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:286 +#: builtin/worktree.c:324 msgid "detach HEAD at named commit" msgstr "" @@ -10547,7 +10564,7 @@ msgid "only useful for debugging" msgstr "" -#: credential-cache--daemon.c:267 +#: credential-cache--daemon.c:255 msgid "print debugging messages to stderr" msgstr "" @@ -10558,27 +10575,27 @@ "to read about a specific subcommand or concept." msgstr "" -#: common-cmds.h:10 +#: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "" -#: common-cmds.h:11 +#: common-cmds.h:10 msgid "work on the current change (see also: git help everyday)" msgstr "" -#: common-cmds.h:12 +#: common-cmds.h:11 msgid "examine the history and state (see also: git help revisions)" msgstr "" -#: common-cmds.h:13 +#: common-cmds.h:12 msgid "grow, mark and tweak your common history" msgstr "" -#: common-cmds.h:14 +#: common-cmds.h:13 msgid "collaborate (see also: git help workflows)" msgstr "" -#: common-cmds.h:18 +#: common-cmds.h:17 msgid "Add file contents to the index" msgstr "" @@ -10586,160 +10603,160 @@ msgid "Use binary search to find the commit that introduced a bug" msgstr "" -#: common-cmds.h:20 +#: common-cmds.h:19 msgid "List, create, or delete branches" msgstr "" -#: common-cmds.h:21 +#: common-cmds.h:20 msgid "Switch branches or restore working tree files" msgstr "" -#: common-cmds.h:22 +#: common-cmds.h:21 msgid "Clone a repository into a new directory" msgstr "" -#: common-cmds.h:23 +#: common-cmds.h:22 msgid "Record changes to the repository" msgstr "" -#: common-cmds.h:24 +#: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -#: common-cmds.h:25 +#: common-cmds.h:24 msgid "Download objects and refs from another repository" msgstr "" -#: common-cmds.h:26 +#: common-cmds.h:25 msgid "Print lines matching a pattern" msgstr "" -#: common-cmds.h:27 +#: common-cmds.h:26 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" -#: common-cmds.h:28 +#: common-cmds.h:27 msgid "Show commit logs" msgstr "" -#: common-cmds.h:29 +#: common-cmds.h:28 msgid "Join two or more development histories together" msgstr "" -#: common-cmds.h:30 +#: common-cmds.h:29 msgid "Move or rename a file, a directory, or a symlink" msgstr "" -#: common-cmds.h:31 +#: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" -#: common-cmds.h:32 +#: common-cmds.h:31 msgid "Update remote refs along with associated objects" msgstr "" -#: common-cmds.h:33 +#: common-cmds.h:32 msgid "Forward-port local commits to the updated upstream head" msgstr "" -#: common-cmds.h:34 +#: common-cmds.h:33 msgid "Reset current HEAD to the specified state" msgstr "" -#: common-cmds.h:35 +#: common-cmds.h:34 msgid "Remove files from the working tree and from the index" msgstr "" -#: common-cmds.h:36 +#: common-cmds.h:35 msgid "Show various types of objects" msgstr "" -#: common-cmds.h:37 +#: common-cmds.h:36 msgid "Show the working tree status" msgstr "" -#: common-cmds.h:38 +#: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -#: parse-options.h:142 +#: parse-options.h:145 msgid "expiry-date" msgstr "" -#: parse-options.h:157 +#: parse-options.h:160 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:231 +#: parse-options.h:237 msgid "be more verbose" msgstr "" -#: parse-options.h:233 +#: parse-options.h:239 msgid "be more quiet" msgstr "" -#: parse-options.h:239 +#: parse-options.h:245 msgid "use <n> digits to display SHA-1s" msgstr "" -#: rerere.h:27 +#: rerere.h:38 msgid "update the index with reused conflict resolution if possible" msgstr "" -#: git-bisect.sh:48 +#: git-bisect.sh:55 msgid "You need to start by \"git bisect start\"" msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:54 +#: git-bisect.sh:61 msgid "Do you want me to do it for you [Y/n]? " msgstr "" -#: git-bisect.sh:95 +#: git-bisect.sh:122 #, sh-format msgid "unrecognised option: '$arg'" msgstr "" -#: git-bisect.sh:99 +#: git-bisect.sh:126 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "" -#: git-bisect.sh:117 +#: git-bisect.sh:155 msgid "Bad HEAD - I need a HEAD" msgstr "" -#: git-bisect.sh:130 +#: git-bisect.sh:168 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "" -#: git-bisect.sh:140 +#: git-bisect.sh:178 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: git-bisect.sh:144 +#: git-bisect.sh:182 msgid "Bad HEAD - strange symbolic ref" msgstr "" -#: git-bisect.sh:189 +#: git-bisect.sh:234 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "" -#: git-bisect.sh:218 +#: git-bisect.sh:263 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:232 +#: git-bisect.sh:278 msgid "Please call 'bisect_state' with at least one argument." msgstr "" -#: git-bisect.sh:244 +#: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" msgstr "" @@ -10757,7 +10774,7 @@ #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:282 +#: git-bisect.sh:328 msgid "Are you sure [Y/n]? " msgstr "" @@ -10776,59 +10793,59 @@ "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:366 git-bisect.sh:493 +#: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:373 +#: git-bisect.sh:421 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:382 +#: git-bisect.sh:430 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:409 +#: git-bisect.sh:458 msgid "No logfile given" msgstr "" -#: git-bisect.sh:410 +#: git-bisect.sh:459 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:427 +#: git-bisect.sh:480 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:439 +#: git-bisect.sh:492 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:446 +#: git-bisect.sh:499 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:472 +#: git-bisect.sh:525 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:478 +#: git-bisect.sh:531 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:485 +#: git-bisect.sh:538 msgid "bisect run success" msgstr "" @@ -10899,34 +10916,34 @@ msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:351 +#: git-rebase.sh:354 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:356 +#: git-rebase.sh:359 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:367 +#: git-rebase.sh:370 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:374 +#: git-rebase.sh:377 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:377 +#: git-rebase.sh:380 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:395 +#: git-rebase.sh:398 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:414 +#: git-rebase.sh:417 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10939,64 +10956,64 @@ "valuable there." msgstr "" -#: git-rebase.sh:465 +#: git-rebase.sh:468 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:489 +#: git-rebase.sh:492 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:495 git-rebase.sh:499 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:501 +#: git-rebase.sh:504 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:524 +#: git-rebase.sh:527 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:557 +#: git-rebase.sh:560 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:562 +#: git-rebase.sh:565 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:566 +#: git-rebase.sh:569 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:586 +#: git-rebase.sh:589 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:590 +#: git-rebase.sh:593 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:601 +#: git-rebase.sh:604 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:610 +#: git-rebase.sh:613 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:620 +#: git-rebase.sh:623 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -11029,7 +11046,7 @@ msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:191 +#: git-stash.sh:189 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -11044,120 +11061,120 @@ #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:241 +#: git-stash.sh:239 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:262 +#: git-stash.sh:260 msgid "No local changes to save" msgstr "" -#: git-stash.sh:266 +#: git-stash.sh:264 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:270 +#: git-stash.sh:268 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:288 +#: git-stash.sh:286 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:389 +#: git-stash.sh:405 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:399 +#: git-stash.sh:415 msgid "No stash found." msgstr "" -#: git-stash.sh:406 +#: git-stash.sh:422 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:412 +#: git-stash.sh:428 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:440 +#: git-stash.sh:456 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:451 +#: git-stash.sh:467 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:459 +#: git-stash.sh:475 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:463 +#: git-stash.sh:479 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:471 +#: git-stash.sh:487 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:473 +#: git-stash.sh:489 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:507 +#: git-stash.sh:523 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:522 +#: git-stash.sh:538 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:545 +#: git-stash.sh:561 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:546 +#: git-stash.sh:562 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:554 +#: git-stash.sh:570 msgid "No branch name specified" msgstr "" -#: git-stash.sh:626 +#: git-stash.sh:642 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:95 +#: git-submodule.sh:104 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:406 +#: git-submodule.sh:281 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:416 +#: git-submodule.sh:291 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:433 +#: git-submodule.sh:308 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:437 +#: git-submodule.sh:312 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11165,181 +11182,181 @@ "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:455 +#: git-submodule.sh:330 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:457 +#: git-submodule.sh:332 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:465 +#: git-submodule.sh:340 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:467 +#: git-submodule.sh:342 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:469 +#: git-submodule.sh:344 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:470 +#: git-submodule.sh:345 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:472 +#: git-submodule.sh:347 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:484 +#: git-submodule.sh:359 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:489 +#: git-submodule.sh:364 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:498 +#: git-submodule.sh:373 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:542 +#: git-submodule.sh:417 #, sh-format msgid "Entering '$prefix$displaypath'" msgstr "" -#: git-submodule.sh:562 +#: git-submodule.sh:437 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:608 +#: git-submodule.sh:483 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -#: git-submodule.sh:617 +#: git-submodule.sh:492 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:494 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:511 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:674 +#: git-submodule.sh:549 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:691 +#: git-submodule.sh:566 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:692 +#: git-submodule.sh:567 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:698 +#: git-submodule.sh:573 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:701 +#: git-submodule.sh:576 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:702 +#: git-submodule.sh:577 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:705 +#: git-submodule.sh:580 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:714 +#: git-submodule.sh:589 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:830 +#: git-submodule.sh:705 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:843 +#: git-submodule.sh:718 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:852 +#: git-submodule.sh:727 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:876 +#: git-submodule.sh:751 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:890 +#: git-submodule.sh:765 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:891 +#: git-submodule.sh:766 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:895 +#: git-submodule.sh:770 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:896 +#: git-submodule.sh:771 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:901 +#: git-submodule.sh:776 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:902 +#: git-submodule.sh:777 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" @@ -11350,50 +11367,50 @@ "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:908 +#: git-submodule.sh:783 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "" -#: git-submodule.sh:938 +#: git-submodule.sh:813 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:1046 +#: git-submodule.sh:921 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:1098 +#: git-submodule.sh:973 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1118 +#: git-submodule.sh:993 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1121 +#: git-submodule.sh:996 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1124 +#: git-submodule.sh:999 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1149 +#: git-submodule.sh:1024 msgid "blob" msgstr "" -#: git-submodule.sh:1267 +#: git-submodule.sh:1142 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1331 +#: git-submodule.sh:1206 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/grub.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/grub.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/grub.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/grub.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:43+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:23+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: .pc/CVE-2015-8370.patch/grub-core/normal/auth.c:217 #: grub-core/normal/auth.c:220 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/gst-plugins-good-1.0.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/gst-plugins-good-1.0.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/gst-plugins-good-1.0.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/gst-plugins-good-1.0.po 2016-04-15 08:51:14.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: gst-plugins-good1.0\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-15 11:40+0200\n" +"POT-Creation-Date: 2016-03-24 11:27+0200\n" "PO-Revision-Date: 2013-04-12 11:34+0000\n" "Last-Translator: Nyi Nyi Htwe <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:33+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 08:11+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ext/jack/gstjackaudiosink.c:356 ext/jack/gstjackaudiosrc.c:364 msgid "Jack server not found" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/gutenprint.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/gutenprint.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/gutenprint.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/gutenprint.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:05+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:46+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/main/dither-main.c:44 src/main/print-color.c:49 #: src/main/print-escp2.c:2376 src/main/print-pcl.c:2080 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/hello.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/hello.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/hello.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/hello.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:44+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:24+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/hello.c:60 msgid "Hello, world!" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ibus-chewing.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ibus-chewing.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ibus-chewing.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ibus-chewing.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:55+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:33+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: /build/ibus-chewing-K_xqsD/ibus-chewing-1.4.14/src/IBusChewingEngine.gob:223 msgid "Chi" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ibus-hangul.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ibus-hangul.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ibus-hangul.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ibus-hangul.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:53+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:31+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../setup/keycapturedialog.py:15 msgid "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/im-config.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/im-config.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/im-config.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/im-config.po 2016-04-15 08:51:16.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: im-config\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-11 17:53+0000\n" +"POT-Creation-Date: 2016-03-26 03:56+0000\n" "PO-Revision-Date: 2013-06-09 12:13+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:14+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:49+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: im-config:15 msgid "system configuration" @@ -74,8 +74,8 @@ #: im-config:140 #, sh-format -msgid "E: dialog must be installed." -msgstr "E: dialog install လုပ်ရမည်။" +msgid "E: whiptail must be installed." +msgstr "" #: im-config:149 #, sh-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/indent.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/indent.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/indent.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/indent.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:59+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:35+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/args.c:611 msgid "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/indicator-datetime.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/indicator-datetime.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/indicator-datetime.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/indicator-datetime.po 2016-04-15 08:51:13.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: indicator-datetime\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-10 16:46+0000\n" +"POT-Creation-Date: 2016-04-06 23:05+0000\n" "PO-Revision-Date: 2012-09-05 11:11+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:05+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:43+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. TRANSLATORS: a strftime(3) format for 12hr time w/seconds #: ../src/formatter.cpp:234 @@ -107,27 +107,27 @@ msgstr "%A, %e %B %Y" #. add the 'Add Event…' menuitem -#: ../src/menu.cpp:352 +#: ../src/menu.cpp:355 msgid "Add Event…" msgstr "Add Event…" -#: ../src/menu.cpp:362 +#: ../src/menu.cpp:365 msgid "Clock" msgstr "နာရီ" -#: ../src/menu.cpp:414 +#: ../src/menu.cpp:417 msgid "Time & Date settings…" msgstr "Time & Date settings…" -#: ../src/menu.cpp:469 +#: ../src/menu.cpp:472 msgid "Date and Time" msgstr "ရက်စွဲ နှင့် အချိန်" -#: ../src/menu.cpp:519 +#: ../src/menu.cpp:522 msgid "Time & Date" msgstr "အချိန်နှင့်ရက်စွဲ" -#: ../src/menu.cpp:524 +#: ../src/menu.cpp:527 #, c-format msgid "%s (has alarms)" msgstr "%s (Alarm ရှိပါတယ်)" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/isoquery.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/isoquery.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/isoquery.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/isoquery.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:49+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:26+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/isoquery.vala:56 #, python-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/kcm_notificationhelper.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/kcm_notificationhelper.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/kcm_notificationhelper.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/kcm_notificationhelper.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:04+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:42+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/kcmodule/notificationhelperconfigmodule.cpp:55 msgid "Kubuntu Notification Helper Configuration" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/kerneloops.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/kerneloops.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/kerneloops.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/kerneloops.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:49+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:26+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: kerneloops-applet.c:170 kerneloops-applet.c:212 msgid "Always" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/keystone.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/keystone.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/keystone.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/keystone.po 2016-04-15 08:51:15.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: keystone\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-02-08 06:29+0000\n" +"POT-Creation-Date: 2016-03-18 06:34+0000\n" "PO-Revision-Date: 2013-04-25 15:31+0000\n" "Last-Translator: Nyi Nyi Htwe <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:21+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:57+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: keystone/exception.py:83 #, python-format @@ -71,80 +71,80 @@ "region hierarchy." msgstr "" -#: keystone/exception.py:144 +#: keystone/exception.py:156 #, python-format msgid "" "The password length must be less than or equal to %(size)i. The server could " "not comply with the request because the password is invalid." msgstr "" -#: keystone/exception.py:152 +#: keystone/exception.py:162 #, python-format msgid "" "Unable to delete region %(region_id)s because it or its child regions have " "associated endpoints." msgstr "" -#: keystone/exception.py:159 +#: keystone/exception.py:167 msgid "" "The certificates you requested are not available. It is likely that this " "server does not use PKI tokens otherwise this is the result of " "misconfiguration." msgstr "" -#: keystone/exception.py:171 +#: keystone/exception.py:179 msgid "(Disable insecure_debug mode to suppress these details.)" msgstr "" -#: keystone/exception.py:181 +#: keystone/exception.py:189 #, python-format msgid "%(message)s %(amendment)s" msgstr "" -#: keystone/exception.py:189 +#: keystone/exception.py:197 msgid "The request you have made requires authentication." msgstr "" -#: keystone/exception.py:195 +#: keystone/exception.py:203 msgid "Authentication plugin error." msgstr "" -#: keystone/exception.py:203 +#: keystone/exception.py:211 #, python-format msgid "Unable to find valid groups while using mapping %(mapping_id)s" msgstr "" -#: keystone/exception.py:208 +#: keystone/exception.py:216 msgid "Attempted to authenticate with an unsupported method." msgstr "" -#: keystone/exception.py:216 +#: keystone/exception.py:224 msgid "Additional authentications steps required." msgstr "" -#: keystone/exception.py:224 +#: keystone/exception.py:232 msgid "You are not authorized to perform the requested action." msgstr "" -#: keystone/exception.py:231 +#: keystone/exception.py:239 #, python-format msgid "You are not authorized to perform the requested action: %(action)s" msgstr "" -#: keystone/exception.py:236 +#: keystone/exception.py:244 #, python-format msgid "" "Could not change immutable attribute(s) '%(attributes)s' in target %(target)s" msgstr "" -#: keystone/exception.py:241 +#: keystone/exception.py:249 #, python-format msgid "" "Group membership across backend boundaries is not allowed, group in question " "is %(group_id)s, user is %(user_id)s" msgstr "" -#: keystone/exception.py:247 +#: keystone/exception.py:255 #, python-format msgid "" "Invalid mix of entities for policy association - only Endpoint, Service or " @@ -152,246 +152,246 @@ "%(service_id)s, Region: %(region_id)s" msgstr "" -#: keystone/exception.py:254 +#: keystone/exception.py:262 #, python-format msgid "Invalid domain specific configuration: %(reason)s" msgstr "" -#: keystone/exception.py:258 +#: keystone/exception.py:266 #, python-format msgid "Could not find: %(target)s" msgstr "" -#: keystone/exception.py:264 +#: keystone/exception.py:272 #, python-format msgid "Could not find endpoint: %(endpoint_id)s" msgstr "" -#: keystone/exception.py:272 +#: keystone/exception.py:279 msgid "An unhandled exception has occurred: Could not find metadata." msgstr "" -#: keystone/exception.py:277 +#: keystone/exception.py:284 #, python-format msgid "Could not find policy: %(policy_id)s" msgstr "" -#: keystone/exception.py:281 +#: keystone/exception.py:288 msgid "Could not find policy association" msgstr "" -#: keystone/exception.py:285 +#: keystone/exception.py:292 #, python-format msgid "Could not find role: %(role_id)s" msgstr "" -#: keystone/exception.py:289 +#: keystone/exception.py:296 #, python-format msgid "%(prior_role_id)s does not imply %(implied_role_id)s" msgstr "" -#: keystone/exception.py:293 +#: keystone/exception.py:300 #, python-format msgid "%(role_id)s cannot be an implied roles" msgstr "" -#: keystone/exception.py:297 +#: keystone/exception.py:304 #, python-format msgid "" "Could not find role assignment with role: %(role_id)s, user or group: " "%(actor_id)s, project or domain: %(target_id)s" msgstr "" -#: keystone/exception.py:303 +#: keystone/exception.py:310 #, python-format msgid "Could not find region: %(region_id)s" msgstr "" -#: keystone/exception.py:307 +#: keystone/exception.py:314 #, python-format msgid "Could not find service: %(service_id)s" msgstr "" -#: keystone/exception.py:311 +#: keystone/exception.py:318 #, python-format msgid "Could not find domain: %(domain_id)s" msgstr "" -#: keystone/exception.py:315 +#: keystone/exception.py:322 #, python-format msgid "Could not find project: %(project_id)s" msgstr "" -#: keystone/exception.py:319 +#: keystone/exception.py:326 #, python-format msgid "Cannot create project with parent: %(project_id)s" msgstr "" -#: keystone/exception.py:323 +#: keystone/exception.py:330 #, python-format msgid "Could not find token: %(token_id)s" msgstr "" -#: keystone/exception.py:327 +#: keystone/exception.py:334 #, python-format msgid "Could not find user: %(user_id)s" msgstr "" -#: keystone/exception.py:331 +#: keystone/exception.py:338 #, python-format msgid "Could not find group: %(group_id)s" msgstr "" -#: keystone/exception.py:335 +#: keystone/exception.py:342 #, python-format msgid "Could not find mapping: %(mapping_id)s" msgstr "" -#: keystone/exception.py:339 +#: keystone/exception.py:346 #, python-format msgid "Could not find trust: %(trust_id)s" msgstr "" -#: keystone/exception.py:343 +#: keystone/exception.py:350 #, python-format msgid "No remaining uses for trust: %(trust_id)s" msgstr "" -#: keystone/exception.py:347 +#: keystone/exception.py:354 #, python-format msgid "Could not find credential: %(credential_id)s" msgstr "" -#: keystone/exception.py:351 +#: keystone/exception.py:358 #, python-format msgid "Could not find version: %(version)s" msgstr "" -#: keystone/exception.py:355 +#: keystone/exception.py:362 #, python-format msgid "Could not find Endpoint Group: %(endpoint_group_id)s" msgstr "" -#: keystone/exception.py:359 +#: keystone/exception.py:366 #, python-format msgid "Could not find Identity Provider: %(idp_id)s" msgstr "" -#: keystone/exception.py:363 +#: keystone/exception.py:370 #, python-format msgid "Could not find Service Provider: %(sp_id)s" msgstr "" -#: keystone/exception.py:367 +#: keystone/exception.py:374 #, python-format msgid "" "Could not find federated protocol %(protocol_id)s for Identity Provider: " "%(idp_id)s" msgstr "" -#: keystone/exception.py:378 +#: keystone/exception.py:385 #, python-format msgid "" "Could not find %(group_or_option)s in domain configuration for domain " "%(domain_id)s" msgstr "" -#: keystone/exception.py:390 +#: keystone/exception.py:403 #, python-format msgid "Conflict occurred attempting to store %(type)s - %(details)s" msgstr "" -#: keystone/exception.py:399 +#: keystone/exception.py:412 msgid "" "An unexpected error prevented the server from fulfilling your request." msgstr "" -#: keystone/exception.py:402 +#: keystone/exception.py:415 #, python-format msgid "" "An unexpected error prevented the server from fulfilling your request: " "%(exception)s" msgstr "" -#: keystone/exception.py:420 +#: keystone/exception.py:433 #, python-format msgid "Unable to consume trust %(trust_id)s, unable to acquire lock." msgstr "" -#: keystone/exception.py:425 +#: keystone/exception.py:438 msgid "" "Expected signing certificates are not available on the server. Please check " "Keystone configuration." msgstr "" -#: keystone/exception.py:431 +#: keystone/exception.py:444 #, python-format msgid "Malformed endpoint URL (%(endpoint)s), see ERROR log for details." msgstr "" -#: keystone/exception.py:436 +#: keystone/exception.py:449 #, python-format msgid "" "Group %(group_id)s returned by mapping %(mapping_id)s was not found in the " "backend." msgstr "" -#: keystone/exception.py:441 +#: keystone/exception.py:454 #, python-format msgid "Error while reading metadata file, %(reason)s" msgstr "" -#: keystone/exception.py:445 +#: keystone/exception.py:458 #, python-format msgid "" "Local section in mapping %(mapping_id)s refers to a remote match that " "doesn't exist (e.g. {0} in a local section)." msgstr "" -#: keystone/exception.py:451 +#: keystone/exception.py:464 #, python-format msgid "" "Unexpected combination of grant attributes - User: %(user_id)s, Group: " "%(group_id)s, Project: %(project_id)s, Domain: %(domain_id)s" msgstr "" -#: keystone/exception.py:458 +#: keystone/exception.py:471 msgid "The action you have requested has not been implemented." msgstr "" -#: keystone/exception.py:465 +#: keystone/exception.py:478 msgid "The service you have requested is no longer available on this server." msgstr "" -#: keystone/exception.py:472 +#: keystone/exception.py:485 #, python-format msgid "The Keystone configuration file %(config_file)s could not be found." msgstr "" -#: keystone/exception.py:477 +#: keystone/exception.py:490 msgid "" "No encryption keys found; run keystone-manage fernet_setup to bootstrap one." msgstr "" -#: keystone/exception.py:482 +#: keystone/exception.py:495 #, python-format msgid "" "The Keystone domain-specific configuration has specified more than one SQL " "driver (only one is permitted): %(source)s." msgstr "" -#: keystone/exception.py:489 +#: keystone/exception.py:502 #, python-format msgid "" "%(mod_name)s doesn't provide database migrations. The migration repository " "path at %(path)s doesn't exist or isn't a directory." msgstr "" -#: keystone/exception.py:496 +#: keystone/exception.py:509 msgid "Token version is unrecognizable or unsupported." msgstr "" -#: keystone/exception.py:501 +#: keystone/exception.py:514 #, python-format msgid "" "Unable to sign SAML assertion. It is likely that this server does not have " @@ -399,20 +399,20 @@ "%(reason)s" msgstr "" -#: keystone/exception.py:508 +#: keystone/exception.py:521 msgid "" "No Authorization headers found, cannot proceed with OAuth related calls, if " "running under HTTPd or Apache, ensure WSGIPassAuthorization is set to On." msgstr "" -#: keystone/exception.py:515 +#: keystone/exception.py:528 #, python-format msgid "" "Could not determine Identity Provider ID. The configuration option " "%(issuer_attribute)s was not found in the request environment." msgstr "" -#: keystone/exception.py:523 +#: keystone/exception.py:536 #, python-format msgid "" "The %s extension has been moved into keystone core and as such its " @@ -420,24 +420,24 @@ "command: keystone-manage db_sync" msgstr "" -#: keystone/exception.py:531 +#: keystone/exception.py:544 #, python-format msgid "%(driver)s is not supported driver version" msgstr "" -#: keystone/notifications.py:286 +#: keystone/notifications.py:232 #, python-format msgid "" "%(event)s is not a valid notification event, must be one of: %(actions)s" msgstr "" -#: keystone/notifications.py:295 +#: keystone/notifications.py:241 #, python-format msgid "Method not callable: %s" msgstr "" #: keystone/assignment/controllers.py:100 keystone/identity/controllers.py:71 -#: keystone/resource/controllers.py:85 +#: keystone/resource/controllers.py:90 msgid "Name field is required and cannot be empty" msgstr "" @@ -447,70 +447,94 @@ msgid "User roles not supported: tenant_id required" msgstr "" -#: keystone/assignment/controllers.py:465 -#: keystone/assignment/controllers.py:754 +#: keystone/assignment/controllers.py:567 +#: keystone/assignment/controllers.py:856 msgid "Specify a domain or project, not both" msgstr "" -#: keystone/assignment/controllers.py:468 +#: keystone/assignment/controllers.py:570 msgid "Specify one of domain or project" msgstr "" -#: keystone/assignment/controllers.py:473 -#: keystone/assignment/controllers.py:759 +#: keystone/assignment/controllers.py:575 +#: keystone/assignment/controllers.py:861 msgid "Specify a user or group, not both" msgstr "" -#: keystone/assignment/controllers.py:476 +#: keystone/assignment/controllers.py:578 msgid "Specify one of user or group" msgstr "" -#: keystone/assignment/controllers.py:743 +#: keystone/assignment/controllers.py:845 msgid "" "Combining effective and group filter will always result in an empty list." msgstr "" -#: keystone/assignment/controllers.py:748 +#: keystone/assignment/controllers.py:850 msgid "" "Combining effective, domain and inherited filters will always result in an " "empty list." msgstr "" -#: keystone/assignment/controllers.py:850 +#: keystone/assignment/controllers.py:952 msgid "" "scope.project.id must be specified if include_subtree is also specified" msgstr "" -#: keystone/assignment/core.py:145 +#: keystone/assignment/core.py:77 +msgid "" +"Use of the identity driver config to automatically configure the same " +"assignment driver has been deprecated, in the \"O\" release, the assignment " +"driver will need to be expicitly configured if different than the default " +"(SQL)." +msgstr "" + +#: keystone/assignment/core.py:88 +#, python-format +msgid "" +"Attempted automatic driver selection for assignment based upon [identity]\\" +"driver option failed since driver %s is not found. Set [assignment]/driver " +"to a valid driver in keystone config." +msgstr "" + +#: keystone/assignment/core.py:179 msgid "Must specify either domain or project" msgstr "" -#: keystone/assignment/core.py:788 +#: keystone/assignment/core.py:848 msgid "Cannot list assignments sourced from groups and filtered by user ID." msgstr "" -#: keystone/assignment/core.py:988 +#: keystone/assignment/core.py:1058 #, python-format msgid "Project (%s)" msgstr "" -#: keystone/assignment/core.py:990 +#: keystone/assignment/core.py:1060 #, python-format msgid "Domain (%s)" msgstr "" -#: keystone/assignment/core.py:992 +#: keystone/assignment/core.py:1062 msgid "Unknown Target" msgstr "" +#: keystone/assignment/core.py:1518 +msgid "Update of `domain_id` is not allowed." +msgstr "" + +#: keystone/assignment/core.py:1743 +msgid "Domain specific roles are not supported in the V8 role driver" +msgstr "" + #: keystone/assignment/V8_backends/sql.py:287 -#: keystone/assignment/backends/sql.py:142 +#: keystone/assignment/backends/sql.py:137 #, python-format msgid "Cannot remove role that has not been granted, %s" msgstr "" #: keystone/assignment/V8_backends/sql.py:363 -#: keystone/assignment/backends/sql.py:218 +#: keystone/assignment/backends/sql.py:213 #, python-format msgid "Unexpected assignment type encountered, %s" msgstr "" @@ -537,7 +561,7 @@ msgid "Project name cannot contain reserved characters." msgstr "" -#: keystone/auth/controllers.py:355 keystone/middleware/auth.py:86 +#: keystone/auth/controllers.py:355 keystone/middleware/auth.py:130 msgid "Scoping to both domain and project is not allowed" msgstr "" @@ -553,7 +577,7 @@ msgid "User not found" msgstr "အသုံးပြုသူကိုရှာမတွေ့ခဲ့ပါ" -#: keystone/auth/controllers.py:634 +#: keystone/auth/controllers.py:644 msgid "A project-scoped token is required to produce a service catalog." msgstr "" @@ -570,7 +594,7 @@ msgid "auth_type is not Negotiate" msgstr "" -#: keystone/auth/plugins/mapped.py:236 +#: keystone/auth/plugins/mapped.py:246 msgid "" "Could not map user while setting ephemeral user identity. Either mapping " "rules must specify user id/name or REMOTE_USER environment variable must be " @@ -593,73 +617,77 @@ msgid "rescope a scoped token" msgstr "" +#: keystone/auth/plugins/totp.py:96 +msgid "Invalid username or TOTP passcode" +msgstr "" + #: keystone/catalog/controllers.py:215 #, python-format msgid "Conflicting region IDs specified: \"%(url_id)s\" != \"%(ref_id)s\"" msgstr "" -#: keystone/catalog/core.py:148 keystone/common/ldap/core.py:1411 +#: keystone/catalog/core.py:149 keystone/common/ldap/core.py:1411 #, python-format msgid "Duplicate ID, %s." msgstr "တထေရာတည်းဖြစ်နေသော ID၊ %s။" -#: keystone/catalog/backends/sql.py:392 +#: keystone/catalog/backends/sql.py:389 #, python-format msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s" msgstr "" -#: keystone/catalog/backends/sql.py:503 +#: keystone/catalog/backends/sql.py:492 msgid "Endpoint Group Project Association not found" msgstr "" -#: keystone/cmd/cli.py:124 +#: keystone/cmd/cli.py:173 msgid "" "Either --bootstrap-password argument or OS_BOOTSTRAP_PASSWORD must be set." msgstr "" -#: keystone/cmd/cli.py:458 +#: keystone/cmd/cli.py:586 msgid "At least one option must be provided" msgstr "" -#: keystone/cmd/cli.py:465 +#: keystone/cmd/cli.py:593 msgid "--all option cannot be mixed with other options" msgstr "" -#: keystone/cmd/cli.py:472 +#: keystone/cmd/cli.py:600 #, python-format msgid "Unknown domain '%(name)s' specified by --domain-name" msgstr "" -#: keystone/cmd/cli.py:527 keystone/tests/unit/test_cli.py:326 +#: keystone/cmd/cli.py:679 keystone/tests/unit/test_cli.py:411 msgid "" "At least one option must be provided, use either --all or --domain-name" msgstr "" -#: keystone/cmd/cli.py:533 keystone/tests/unit/test_cli.py:342 +#: keystone/cmd/cli.py:685 keystone/tests/unit/test_cli.py:427 msgid "The --all option cannot be used with the --domain-name option" msgstr "" -#: keystone/cmd/cli.py:558 keystone/tests/unit/test_cli.py:359 +#: keystone/cmd/cli.py:710 keystone/tests/unit/test_cli.py:444 #, python-format msgid "" "Invalid domain name: %(domain)s found in config file name: %(file)s - " "ignoring this file." msgstr "" -#: keystone/cmd/cli.py:566 keystone/tests/unit/test_cli.py:300 +#: keystone/cmd/cli.py:718 keystone/tests/unit/test_cli.py:385 #, python-format msgid "" "Domain: %(domain)s already has a configuration defined - ignoring file: " "%(file)s." msgstr "" -#: keystone/cmd/cli.py:580 +#: keystone/cmd/cli.py:732 #, python-format msgid "" "Error parsing configuration file for domain: %(domain)s, file: %(file)s." msgstr "" -#: keystone/cmd/cli.py:613 +#: keystone/cmd/cli.py:765 #, python-format msgid "" "To get a more detailed information on this error, re-run this command for " @@ -667,33 +695,33 @@ "name %s" msgstr "" -#: keystone/cmd/cli.py:631 +#: keystone/cmd/cli.py:783 #, python-format msgid "Unable to locate domain config directory: %s" msgstr "" -#: keystone/cmd/cli.py:664 +#: keystone/cmd/cli.py:803 msgid "" "Unable to access the keystone database, please check it is configured " "correctly." msgstr "" -#: keystone/cmd/cli.py:727 +#: keystone/cmd/cli.py:866 #, python-format msgid "Error while parsing rules %(path)s: %(err)s" msgstr "" -#: keystone/cmd/cli.py:736 +#: keystone/cmd/cli.py:875 #, python-format msgid "Error while opening file %(path)s: %(err)s" msgstr "" -#: keystone/cmd/cli.py:746 +#: keystone/cmd/cli.py:885 #, python-format msgid "Error while parsing line: '%(line)s': %(err)s" msgstr "" -#: keystone/common/authorization.py:61 keystone/common/wsgi.py:66 +#: keystone/common/authorization.py:61 keystone/common/wsgi.py:67 #, python-format msgid "token reference must be a KeystoneToken type, got: %s" msgstr "" @@ -720,7 +748,7 @@ msgstr "" #: keystone/common/controller.py:349 keystone/common/controller.py:377 -#: keystone/identity/core.py:586 keystone/resource/core.py:924 +#: keystone/identity/core.py:595 keystone/resource/core.py:1143 #, python-format msgid "Expected dict or list: %s" msgstr "" @@ -737,7 +765,7 @@ msgid "Cannot change Domain ID" msgstr "" -#: keystone/common/controller.py:749 +#: keystone/common/controller.py:751 msgid "" "You have tried to create a resource using the admin token. As this token is " "not within a domain you must explicitly include a domain for this resource " @@ -760,7 +788,7 @@ msgid "Unexpected status requested for JSON Home response, %s" msgstr "" -#: keystone/common/manager.py:78 +#: keystone/common/manager.py:82 #, python-format msgid "" "Direct import of driver %(name)r is deprecated as of Liberty in favor of its " @@ -777,16 +805,16 @@ "domain id, or user name with domain name." msgstr "" -#: keystone/common/utils.py:61 +#: keystone/common/utils.py:63 msgid "" "Length of transformable resource id > 64, which is max allowed characters" msgstr "" -#: keystone/common/utils.py:190 keystone/credential/controllers.py:44 +#: keystone/common/utils.py:192 keystone/credential/controllers.py:44 msgid "Invalid blob in credential" msgstr "" -#: keystone/common/wsgi.py:205 +#: keystone/common/wsgi.py:208 msgid "Query string is not UTF-8 encoded" msgstr "" @@ -800,7 +828,7 @@ msgid "%s field(s) cannot be empty" msgstr "" -#: keystone/common/wsgi.py:542 +#: keystone/common/wsgi.py:548 msgid "The resource could not be found." msgstr "" @@ -823,12 +851,12 @@ msgid "`key_mangler` option must be a function reference" msgstr "" -#: keystone/common/kvs/core.py:375 +#: keystone/common/kvs/core.py:376 #, python-format msgid "Lock key must match target key: %(lock)s != %(target)s" msgstr "" -#: keystone/common/kvs/core.py:379 +#: keystone/common/kvs/core.py:380 msgid "Must be called within an active lock context." msgstr "" @@ -922,21 +950,21 @@ msgid "Member %(member)s is already a member of group %(group)s" msgstr "" -#: keystone/common/sql/core.py:409 +#: keystone/common/sql/core.py:413 msgid "Duplicate Entry" msgstr "" -#: keystone/common/sql/core.py:425 +#: keystone/common/sql/core.py:429 #, python-format msgid "An unexpected error occurred when trying to store %s" msgstr "" -#: keystone/common/sql/migration_helpers.py:158 +#: keystone/common/sql/migration_helpers.py:167 msgid "Unable to downgrade schema" msgstr "" -#: keystone/common/sql/migration_helpers.py:176 -#: keystone/common/sql/migration_helpers.py:218 +#: keystone/common/sql/migration_helpers.py:185 +#: keystone/common/sql/migration_helpers.py:231 #, python-format msgid "%s extension does not exist." msgstr "" @@ -948,11 +976,18 @@ "%(func_name)r." msgstr "" -#: keystone/common/validation/validators.py:54 +#: keystone/common/validation/validators.py:53 #, python-format msgid "Invalid input for field '%(path)s'. The value is '%(value)s'." msgstr "" +#: keystone/contrib/admin_crud/core.py:28 +msgid "" +"Remove admin_crud_extension from the paste pipeline, the admin_crud " +"extension is now always available. Updatethe [pipeline:admin_api] section in " +"keystone-paste.ini accordingly, as it will be removed in the O release." +msgstr "" + #: keystone/contrib/ec2/controllers.py:80 keystone/contrib/s3/core.py:111 #: keystone/contrib/s3/core.py:114 msgid "Invalid EC2 signature." @@ -1021,6 +1056,13 @@ "accordingly, as it will be removed in the O release." msgstr "" +#: keystone/contrib/user_crud/core.py:28 +msgid "" +"Remove user_crud_extension from the paste pipeline, the user_crud extension " +"is now always available. Updatethe [pipeline:public_api] section in keystone-" +"paste.ini accordingly, as it will be removed in the O release." +msgstr "" + #: keystone/endpoint_policy/core.py:264 #, python-format msgid "No policy is associated with endpoint %(endpoint_id)s." @@ -1062,38 +1104,44 @@ "or billing." msgstr "" -#: keystone/federation/utils.py:222 +#: keystone/federation/utils.py:234 msgid "Federation token is expired" msgstr "" -#: keystone/federation/utils.py:274 +#: keystone/federation/utils.py:286 msgid "Could not find Identity Provider identifier in environment" msgstr "" -#: keystone/federation/utils.py:278 +#: keystone/federation/utils.py:290 msgid "" "Incoming identity provider identifier not included among the accepted " "identifiers." msgstr "" -#: keystone/federation/utils.py:572 +#: keystone/federation/utils.py:585 #, python-format msgid "User type %s not supported" msgstr "" -#: keystone/federation/utils.py:607 +#: keystone/federation/utils.py:605 +msgid "" +"Could not map any federated user properties to identity values. Check debug " +"logs or the mapping used for additional details." +msgstr "" + +#: keystone/federation/utils.py:629 #, python-format msgid "" "Invalid rule: %(identity_value)s. Both 'groups' and 'domain' keywords must " "be specified." msgstr "" -#: keystone/federation/utils.py:833 +#: keystone/federation/utils.py:854 #, python-format msgid "Identity Provider %(idp)s is disabled" msgstr "" -#: keystone/federation/utils.py:841 +#: keystone/federation/utils.py:862 #, python-format msgid "Service Provider %(sp)s is disabled" msgstr "" @@ -1112,35 +1160,40 @@ msgid "Enabled field must be a boolean" msgstr "" -#: keystone/identity/controllers.py:101 +#: keystone/identity/controllers.py:103 msgid "Enabled field should be a boolean" msgstr "" -#: keystone/identity/core.py:262 +#: keystone/identity/core.py:265 #, python-format msgid "Config API entity at /domains/%s/config" msgstr "" -#: keystone/identity/core.py:268 +#: keystone/identity/core.py:271 #, python-format msgid "" "Exceeded attempts to register domain %(domain)s to use the SQL driver, the " "last domain that appears to have had it is %(last_domain)s, giving up" msgstr "" -#: keystone/identity/core.py:441 keystone/identity/backends/ldap.py:65 -#: keystone/identity/backends/ldap.py:67 keystone/identity/backends/ldap.py:73 -#: keystone/identity/backends/ldap.py:75 keystone/identity/backends/sql.py:107 -#: keystone/identity/backends/sql.py:109 +#: keystone/identity/core.py:450 keystone/identity/backends/ldap.py:62 +#: keystone/identity/backends/ldap.py:64 keystone/identity/backends/ldap.py:70 +#: keystone/identity/backends/ldap.py:72 keystone/identity/backends/sql.py:210 +#: keystone/identity/backends/sql.py:212 msgid "Invalid user / password" msgstr "" -#: keystone/identity/core.py:851 +#: keystone/identity/core.py:895 #, python-format msgid "User is disabled: %s" msgstr "အသုံးပြုသူကိုပိတ်ထားသည် - %s" -#: keystone/identity/core.py:893 +#: keystone/identity/core.py:928 keystone/resource/core.py:375 +msgid "" +"update of domain_id is deprecated as of Mitaka and will be removed in O." +msgstr "" + +#: keystone/identity/core.py:947 msgid "Cannot change user ID" msgstr "" @@ -1152,17 +1205,17 @@ "release." msgstr "" -#: keystone/identity/backends/ldap.py:109 +#: keystone/identity/backends/ldap.py:106 msgid "Cannot change user name" msgstr "" -#: keystone/identity/backends/ldap.py:210 keystone/identity/backends/sql.py:191 -#: keystone/identity/backends/sql.py:209 +#: keystone/identity/backends/ldap.py:214 keystone/identity/backends/sql.py:292 +#: keystone/identity/backends/sql.py:310 #, python-format msgid "User '%(user_id)s' not found in group '%(group_id)s'" msgstr "" -#: keystone/identity/backends/ldap.py:361 +#: keystone/identity/backends/ldap.py:366 #, python-format msgid "User %(user_id)s is already a member of group %(group_id)s" msgstr "" @@ -1171,51 +1224,51 @@ msgid "Found invalid token: scoped to both project and domain." msgstr "" -#: keystone/oauth1/controllers.py:125 +#: keystone/oauth1/controllers.py:126 msgid "Cannot list request tokens with a token issued via delegation." msgstr "" -#: keystone/oauth1/controllers.py:186 keystone/oauth1/backends/sql.py:268 +#: keystone/oauth1/controllers.py:187 keystone/oauth1/backends/sql.py:256 msgid "User IDs do not match" msgstr "" -#: keystone/oauth1/controllers.py:242 +#: keystone/oauth1/controllers.py:243 msgid "Invalid signature" msgstr "" -#: keystone/oauth1/controllers.py:293 keystone/oauth1/controllers.py:371 +#: keystone/oauth1/controllers.py:294 keystone/oauth1/controllers.py:372 msgid "Request token is expired" msgstr "" -#: keystone/oauth1/controllers.py:307 +#: keystone/oauth1/controllers.py:308 msgid "There should not be any non-oauth parameters" msgstr "" -#: keystone/oauth1/controllers.py:311 +#: keystone/oauth1/controllers.py:312 msgid "provided consumer key does not match stored consumer key" msgstr "" -#: keystone/oauth1/controllers.py:315 +#: keystone/oauth1/controllers.py:316 msgid "provided verifier does not match stored verifier" msgstr "" -#: keystone/oauth1/controllers.py:319 +#: keystone/oauth1/controllers.py:320 msgid "provided request key does not match stored request key" msgstr "" -#: keystone/oauth1/controllers.py:323 +#: keystone/oauth1/controllers.py:324 msgid "Request Token does not have an authorizing user id" msgstr "" -#: keystone/oauth1/controllers.py:360 +#: keystone/oauth1/controllers.py:361 msgid "Cannot authorize a request token with a token issued via delegation." msgstr "" -#: keystone/oauth1/controllers.py:387 +#: keystone/oauth1/controllers.py:388 msgid "authorizing user does not have role required" msgstr "" -#: keystone/oauth1/controllers.py:400 +#: keystone/oauth1/controllers.py:401 msgid "User is not a member of the requested project" msgstr "" @@ -1223,205 +1276,250 @@ msgid "Consumer not found" msgstr "" -#: keystone/oauth1/backends/sql.py:184 +#: keystone/oauth1/backends/sql.py:177 msgid "Request token not found" msgstr "" -#: keystone/oauth1/backends/sql.py:248 +#: keystone/oauth1/backends/sql.py:237 msgid "Access token not found" msgstr "" -#: keystone/resource/controllers.py:89 +#: keystone/resource/controllers.py:94 msgid "The creation of projects acting as domains is not allowed in v2." msgstr "" -#: keystone/resource/controllers.py:238 -msgid "The creation of projects acting as domains is not allowed yet." -msgstr "" - -#: keystone/resource/controllers.py:272 +#: keystone/resource/controllers.py:284 msgid "" "Cannot use parents_as_list and parents_as_ids query params at the same time." msgstr "" -#: keystone/resource/controllers.py:278 +#: keystone/resource/controllers.py:290 msgid "" "Cannot use subtree_as_list and subtree_as_ids query params at the same time." msgstr "" -#: keystone/resource/core.py:91 +#: keystone/resource/core.py:106 #, python-format -msgid "max hierarchy depth reached for %s branch." +msgid "Max hierarchy depth reached for %s branch." msgstr "" -#: keystone/resource/core.py:109 keystone/resource/core.py:525 +#: keystone/resource/core.py:123 msgid "Multiple domains are not supported" msgstr "" -#: keystone/resource/core.py:115 +#: keystone/resource/core.py:129 msgid "only root projects are allowed to act as domains." msgstr "" -#: keystone/resource/core.py:139 +#: keystone/resource/core.py:152 +#, python-format +msgid "" +"Cannot create project, since its parent (%(domain_id)s) is acting as a " +"domain, but project's specified parent_id (%(parent_id)s) does not match " +"this domain_id." +msgstr "" + +#: keystone/resource/core.py:163 #, python-format msgid "" "Cannot create project, since it specifies its owner as domain %(domain_id)s, " "but specifies a parent in a different domain (%(parent_domain_id)s)." msgstr "" -#: keystone/resource/core.py:164 +#: keystone/resource/core.py:183 #, python-format msgid "cannot create a project in a branch containing a disabled project: %s" msgstr "" -#: keystone/resource/core.py:172 +#: keystone/resource/core.py:191 #, python-format msgid "" "%(entity)s name cannot contain the following reserved characters: %(chars)s" msgstr "" -#: keystone/resource/core.py:224 +#: keystone/resource/core.py:201 +#, python-format +msgid "" +"it is not permitted to have two projects acting as domains with the same " +"name: %s" +msgstr "" + +#: keystone/resource/core.py:205 +#, python-format +msgid "" +"it is not permitted to have two projects within a domain with the same name " +": %s" +msgstr "" + +#: keystone/resource/core.py:262 #, python-format msgid "Domain is disabled: %s" msgstr "Domain ကိုပိတ်ထားသည် - %s" -#: keystone/resource/core.py:241 +#: keystone/resource/core.py:279 #, python-format msgid "Domain cannot be named %s" msgstr "" -#: keystone/resource/core.py:244 +#: keystone/resource/core.py:282 #, python-format msgid "Domain cannot have ID %s" msgstr "" -#: keystone/resource/core.py:256 +#: keystone/resource/core.py:297 #, python-format msgid "Project is disabled: %s" msgstr "" -#: keystone/resource/core.py:276 -#, python-format -msgid "cannot enable project %s since it has disabled parents" -msgstr "" - -#: keystone/resource/core.py:284 +#: keystone/resource/core.py:304 #, python-format -msgid "cannot disable project %s since its subtree contains enabled projects" +msgid "Cannot enable project %s since it has disabled parents" msgstr "" -#: keystone/resource/core.py:303 +#: keystone/resource/core.py:340 msgid "Update of `parent_id` is not allowed." msgstr "" -#: keystone/resource/core.py:308 +#: keystone/resource/core.py:345 msgid "Update of `is_domain` is not allowed." msgstr "" -#: keystone/resource/core.py:352 +#: keystone/resource/core.py:359 +msgid "Update of domain_id of projects acting as domains is not allowed." +msgstr "" + +#: keystone/resource/core.py:366 +msgid "Update of domain_id is only allowed for root projects." +msgstr "" + +#: keystone/resource/core.py:371 +msgid "Cannot update domain_id of a project that has children." +msgstr "" + +#: keystone/resource/core.py:396 +#, python-format +msgid "" +"Cannot disable project %(project_id)s since its subtree contains enabled " +"projects." +msgstr "" + +#: keystone/resource/core.py:441 +msgid "Cascade update is only allowed for enabled attribute." +msgstr "" + +#: keystone/resource/core.py:505 #, python-format msgid "" "cannot delete an enabled project acting as a domain. Please disable the " "project %s first." msgstr "" -#: keystone/resource/core.py:358 +#: keystone/resource/core.py:511 #, python-format -msgid "cannot delete the project %s since it is not a leaf in the hierarchy." +msgid "" +"Cannot delete the project %s since it is not a leaf in the hierarchy. Use " +"the cascade option if you want to delete a whole subtree." msgstr "" -#: keystone/resource/core.py:389 +#: keystone/resource/core.py:524 +#, python-format +msgid "" +"Cannot delete project %(project_id)s since its subtree contains enabled " +"projects." +msgstr "" + +#: keystone/resource/core.py:552 msgid "Project field is required and cannot be empty." msgstr "" -#: keystone/resource/core.py:592 -msgid "cannot delete a domain that is enabled, please disable it first." +#: keystone/resource/core.py:793 +msgid "Cannot delete a domain that is enabled, please disable it first." msgstr "" -#: keystone/resource/core.py:1141 +#: keystone/resource/core.py:1568 msgid "No options specified" msgstr "" -#: keystone/resource/core.py:1147 +#: keystone/resource/core.py:1574 #, python-format msgid "" "The value of group %(group)s specified in the config should be a dictionary " "of options" msgstr "" -#: keystone/resource/core.py:1171 +#: keystone/resource/core.py:1598 #, python-format msgid "" "Option %(option)s found with no group specified while checking domain " "configuration request" msgstr "" -#: keystone/resource/core.py:1178 +#: keystone/resource/core.py:1605 #, python-format msgid "Group %(group)s is not supported for domain specific configurations" msgstr "" -#: keystone/resource/core.py:1185 +#: keystone/resource/core.py:1612 #, python-format msgid "" "Option %(option)s in group %(group)s is not supported for domain specific " "configurations" msgstr "" -#: keystone/resource/core.py:1237 +#: keystone/resource/core.py:1664 msgid "An unexpected error occurred when retrieving domain configs" msgstr "" -#: keystone/resource/core.py:1316 keystone/resource/core.py:1399 -#: keystone/resource/core.py:1469 keystone/resource/config_backends/sql.py:76 +#: keystone/resource/core.py:1743 keystone/resource/core.py:1826 +#: keystone/resource/core.py:1896 keystone/resource/config_backends/sql.py:76 #, python-format msgid "option %(option)s in group %(group)s" msgstr "" -#: keystone/resource/core.py:1319 keystone/resource/core.py:1404 -#: keystone/resource/core.py:1465 +#: keystone/resource/core.py:1746 keystone/resource/core.py:1831 +#: keystone/resource/core.py:1892 #, python-format msgid "group %(group)s" msgstr "" -#: keystone/resource/core.py:1321 +#: keystone/resource/core.py:1748 msgid "any options" msgstr "" -#: keystone/resource/core.py:1364 +#: keystone/resource/core.py:1791 #, python-format msgid "" "Trying to update option %(option)s in group %(group)s, so that, and only " "that, option must be specified in the config" msgstr "" -#: keystone/resource/core.py:1369 +#: keystone/resource/core.py:1796 #, python-format msgid "" "Trying to update group %(group)s, so that, and only that, group must be " "specified in the config" msgstr "" -#: keystone/resource/core.py:1378 +#: keystone/resource/core.py:1805 #, python-format msgid "" "request to update group %(group)s, but config provided contains group " "%(group_other)s instead" msgstr "" -#: keystone/resource/core.py:1385 +#: keystone/resource/core.py:1812 #, python-format msgid "" "Trying to update option %(option)s in group %(group)s, but config provided " "contains option %(option_other)s instead" msgstr "" -#: keystone/resource/core.py:1577 +#: keystone/resource/core.py:2004 #, python-format msgid "Group %s not found in config" msgstr "" -#: keystone/resource/core.py:1587 +#: keystone/resource/core.py:2014 #, python-format msgid "" "Reading the default for option %(option)s in group %(group)s is not supported" @@ -1438,9 +1536,9 @@ "in the Keystone server. The current request is aborted." msgstr "" -#: keystone/revoke/core.py:224 keystone/token/provider.py:217 -#: keystone/token/provider.py:241 keystone/token/provider.py:312 -#: keystone/token/provider.py:319 +#: keystone/revoke/core.py:226 keystone/token/provider.py:217 +#: keystone/token/provider.py:256 keystone/token/provider.py:336 +#: keystone/token/provider.py:343 msgid "Failed to validate token" msgstr "" @@ -1474,7 +1572,7 @@ msgid "Token does not belong to specified tenant." msgstr "" -#: keystone/token/provider.py:254 keystone/token/provider.py:273 +#: keystone/token/provider.py:269 keystone/token/provider.py:293 msgid "No token in the request" msgstr "" @@ -1483,51 +1581,51 @@ msgid "Unknown token version %s" msgstr "" -#: keystone/token/providers/common.py:286 -#: keystone/token/providers/common.py:400 +#: keystone/token/providers/common.py:313 +#: keystone/token/providers/common.py:445 #, python-format msgid "User %(user_id)s has no access to project %(project_id)s" msgstr "" -#: keystone/token/providers/common.py:291 -#: keystone/token/providers/common.py:405 +#: keystone/token/providers/common.py:318 +#: keystone/token/providers/common.py:450 #, python-format msgid "User %(user_id)s has no access to domain %(domain_id)s" msgstr "" -#: keystone/token/providers/common.py:318 +#: keystone/token/providers/common.py:345 msgid "Trustor is disabled." msgstr "" -#: keystone/token/providers/common.py:391 +#: keystone/token/providers/common.py:434 msgid "Trustee has no delegated roles." msgstr "" -#: keystone/token/providers/common.py:451 +#: keystone/token/providers/common.py:496 #, python-format msgid "Invalid audit info data type: %(data)s (%(type)s)" msgstr "" -#: keystone/token/providers/common.py:515 -#: keystone/token/providers/common.py:542 +#: keystone/token/providers/common.py:560 +#: keystone/token/providers/common.py:587 msgid "The configured token provider does not support bind authentication." msgstr "" -#: keystone/token/providers/common.py:553 +#: keystone/token/providers/common.py:598 msgid "User is not a trustee." msgstr "" -#: keystone/token/providers/common.py:620 +#: keystone/token/providers/common.py:665 msgid "" "Attempting to use OS-FEDERATION token with V2 Identity Service, use V3 " "Authentication" msgstr "" -#: keystone/token/providers/common.py:630 +#: keystone/token/providers/common.py:675 msgid "Non-default domain is not supported" msgstr "" -#: keystone/token/providers/common.py:634 +#: keystone/token/providers/common.py:679 msgid "Domain scoped token is not supported" msgstr "" @@ -1535,36 +1633,30 @@ msgid "Unable to sign token." msgstr "" -#: keystone/token/providers/fernet/core.py:166 -msgid "" -"This is not a v2.0 Fernet token. Use v3 for trust, domain, or federated " -"tokens." -msgstr "" - #: keystone/token/providers/fernet/token_formatters.py:102 #, python-format msgid "This is not a recognized Fernet token %s" msgstr "" -#: keystone/token/providers/fernet/token_formatters.py:197 +#: keystone/token/providers/fernet/token_formatters.py:198 #, python-format msgid "This is not a recognized Fernet payload version: %s" msgstr "" -#: keystone/trust/controllers.py:111 +#: keystone/trust/controllers.py:107 #, python-format msgid "role %s is not defined" msgstr "" -#: keystone/trust/controllers.py:135 +#: keystone/trust/controllers.py:131 msgid "Redelegation allowed for delegated by trust only" msgstr "" -#: keystone/trust/controllers.py:168 +#: keystone/trust/controllers.py:164 msgid "The authenticated user should match the trustor." msgstr "" -#: keystone/trust/controllers.py:173 +#: keystone/trust/controllers.py:169 msgid "At least one role should be specified." msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/landscape-client.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/landscape-client.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/landscape-client.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/landscape-client.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:11+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:51+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../landscape/ui/controller/app.py:49 msgid "Success." diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/language-selector.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/language-selector.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/language-selector.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/language-selector.po 2016-04-15 08:51:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: language-selector\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-19 00:39+0000\n" +"POT-Creation-Date: 2016-04-14 05:04+0000\n" "PO-Revision-Date: 2013-06-10 05:27+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:32+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. Hack for Chinese langpack split #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically. diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libcwidget3.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libcwidget3.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libcwidget3.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libcwidget3.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:43+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:19+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libgphoto2_port-0.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libgphoto2_port-0.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libgphoto2_port-0.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libgphoto2_port-0.po 2016-04-15 08:51:15.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:11+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:48+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: libgphoto2_port/gphoto2-port-info-list.c:214 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libhdate.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libhdate.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libhdate.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libhdate.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,1312 +0,0 @@ -# Burmese translation for libhdate -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the libhdate package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: libhdate\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2012-01-08 19:48-0500\n" -"PO-Revision-Date: 2013-05-28 10:04+0000\n" -"Last-Translator: Nyi Nyi Htwe <Unknown>\n" -"Language-Team: Burmese <my@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:03+0000\n" -"X-Generator: Launchpad (build 17958)\n" - -#: src/hdate_strings.c:186 src/hdate_strings.c:190 -msgid "translator" -msgstr "ဘာသာပြန်သူ" - -#: src/hdate_strings.c:248 -msgid "Sunday" -msgstr "တနင်္ဂနွေနေ့" - -#: src/hdate_strings.c:248 -msgid "Monday" -msgstr "တနင်္လာနေ့" - -#: src/hdate_strings.c:248 -msgid "Tuesday" -msgstr "အင်္ဂါနေ့" - -#: src/hdate_strings.c:248 -msgid "Wednesday" -msgstr "ဗုဒ္ဒ့ဟူးနေ့" - -#: src/hdate_strings.c:249 -msgid "Thursday" -msgstr "ကြာသပတေးနေ့" - -#: src/hdate_strings.c:249 -msgid "Friday" -msgstr "သောကြာနေ့" - -#: src/hdate_strings.c:249 -msgid "Saturday" -msgstr "စနေနေ့" - -#: src/hdate_strings.c:251 -msgid "Sun" -msgstr "တနင်္ဂနွေ" - -#: src/hdate_strings.c:251 -msgid "Mon" -msgstr "တနင်္လာ" - -#: src/hdate_strings.c:251 -msgid "Tue" -msgstr "" - -#: src/hdate_strings.c:251 -msgid "Wed" -msgstr "" - -#: src/hdate_strings.c:251 -msgid "Thu" -msgstr "" - -#: src/hdate_strings.c:252 -msgid "Fri" -msgstr "" - -#: src/hdate_strings.c:252 -msgid "Sat" -msgstr "" - -#: src/hdate_strings.c:265 src/hdate_strings.c:288 -msgid "none" -msgstr "" - -#: src/hdate_strings.c:265 src/hdate_strings.c:288 -msgid "Bereshit" -msgstr "Bereshit" - -#: src/hdate_strings.c:265 src/hdate_strings.c:288 -msgid "Noach" -msgstr "Noach" - -#: src/hdate_strings.c:266 src/hdate_strings.c:289 -msgid "Lech-Lecha" -msgstr "Lech-Lecha" - -#: src/hdate_strings.c:266 src/hdate_strings.c:289 -msgid "Vayera" -msgstr "Vayera" - -#: src/hdate_strings.c:266 src/hdate_strings.c:289 -msgid "Chayei Sara" -msgstr "Chayei Sara" - -#: src/hdate_strings.c:267 src/hdate_strings.c:290 -msgid "Toldot" -msgstr "Toldot" - -#: src/hdate_strings.c:267 src/hdate_strings.c:290 -msgid "Vayetzei" -msgstr "Vayetzei" - -#: src/hdate_strings.c:267 src/hdate_strings.c:290 -msgid "Vayishlach" -msgstr "Vayishlach" - -#: src/hdate_strings.c:268 src/hdate_strings.c:291 -msgid "Vayeshev" -msgstr "Vayeshev" - -#: src/hdate_strings.c:268 src/hdate_strings.c:291 -msgid "Miketz" -msgstr "Miketz" - -#: src/hdate_strings.c:268 src/hdate_strings.c:291 -msgid "Vayigash" -msgstr "Vayigash" - -#: src/hdate_strings.c:269 src/hdate_strings.c:292 -msgid "Vayechi" -msgstr "Vayechi" - -#: src/hdate_strings.c:269 src/hdate_strings.c:292 -msgid "Shemot" -msgstr "Shemot" - -#: src/hdate_strings.c:269 src/hdate_strings.c:292 -msgid "Vaera" -msgstr "Vaera" - -#: src/hdate_strings.c:270 src/hdate_strings.c:293 -msgid "Bo" -msgstr "Bo" - -#: src/hdate_strings.c:270 src/hdate_strings.c:293 -msgid "Beshalach" -msgstr "Beshalach" - -#: src/hdate_strings.c:270 src/hdate_strings.c:293 -msgid "Yitro" -msgstr "Yitro" - -#: src/hdate_strings.c:271 src/hdate_strings.c:294 -msgid "Mishpatim" -msgstr "Mishpatim" - -#: src/hdate_strings.c:271 src/hdate_strings.c:294 -msgid "Terumah" -msgstr "Terumah" - -#: src/hdate_strings.c:271 src/hdate_strings.c:294 -msgid "Tetzaveh" -msgstr "Tetzaveh" - -#: src/hdate_strings.c:272 src/hdate_strings.c:295 -msgid "Ki Tisa" -msgstr "Ki Tisa" - -#: src/hdate_strings.c:272 src/hdate_strings.c:295 -msgid "Vayakhel" -msgstr "Vayakhel" - -#: src/hdate_strings.c:272 src/hdate_strings.c:295 -msgid "Pekudei" -msgstr "Pekudei" - -#: src/hdate_strings.c:273 src/hdate_strings.c:296 -msgid "Vayikra" -msgstr "Vayikra" - -#: src/hdate_strings.c:273 src/hdate_strings.c:296 -msgid "Tzav" -msgstr "Tzav" - -#: src/hdate_strings.c:273 src/hdate_strings.c:296 -msgid "Shmini" -msgstr "Shmini" - -#: src/hdate_strings.c:274 src/hdate_strings.c:297 -msgid "Tazria" -msgstr "Tazria" - -#: src/hdate_strings.c:274 src/hdate_strings.c:297 -msgid "Metzora" -msgstr "Metzora" - -#: src/hdate_strings.c:274 src/hdate_strings.c:297 -msgid "Achrei Mot" -msgstr "Achrei Mot" - -#: src/hdate_strings.c:275 src/hdate_strings.c:298 -msgid "Kedoshim" -msgstr "Kedoshim" - -#: src/hdate_strings.c:275 src/hdate_strings.c:298 -msgid "Emor" -msgstr "Emor" - -#: src/hdate_strings.c:275 src/hdate_strings.c:298 -msgid "Behar" -msgstr "Behar" - -#: src/hdate_strings.c:276 src/hdate_strings.c:299 -msgid "Bechukotai" -msgstr "Bechukotai" - -#: src/hdate_strings.c:276 src/hdate_strings.c:299 -msgid "Bamidbar" -msgstr "Bamidbar" - -#: src/hdate_strings.c:276 src/hdate_strings.c:299 -msgid "Nasso" -msgstr "Nasso" - -#: src/hdate_strings.c:277 src/hdate_strings.c:300 -msgid "Beha'alotcha" -msgstr "Beha'alotcha" - -#: src/hdate_strings.c:277 src/hdate_strings.c:300 -msgid "Sh'lach" -msgstr "Sh'lach" - -#: src/hdate_strings.c:277 src/hdate_strings.c:300 -msgid "Korach" -msgstr "Korach" - -#: src/hdate_strings.c:278 src/hdate_strings.c:301 -msgid "Chukat" -msgstr "Chukat" - -#: src/hdate_strings.c:278 src/hdate_strings.c:301 -msgid "Balak" -msgstr "Balak" - -#: src/hdate_strings.c:278 src/hdate_strings.c:301 -msgid "Pinchas" -msgstr "Pinchas" - -#: src/hdate_strings.c:279 src/hdate_strings.c:302 -msgid "Matot" -msgstr "Matot" - -#: src/hdate_strings.c:279 src/hdate_strings.c:302 -msgid "Masei" -msgstr "Masei" - -#: src/hdate_strings.c:279 src/hdate_strings.c:302 -msgid "Devarim" -msgstr "Devarim" - -#: src/hdate_strings.c:280 src/hdate_strings.c:303 -msgid "Vaetchanan" -msgstr "Vaetchanan" - -#: src/hdate_strings.c:280 src/hdate_strings.c:303 -msgid "Eikev" -msgstr "Eikev" - -#: src/hdate_strings.c:280 src/hdate_strings.c:303 -msgid "Re'eh" -msgstr "Re'eh" - -#: src/hdate_strings.c:281 src/hdate_strings.c:304 -msgid "Shoftim" -msgstr "Shoftim" - -#: src/hdate_strings.c:281 src/hdate_strings.c:304 -msgid "Ki Teitzei" -msgstr "Ki Teitzei" - -#: src/hdate_strings.c:281 src/hdate_strings.c:304 -msgid "Ki Tavo" -msgstr "Ki Tavo" - -#: src/hdate_strings.c:282 src/hdate_strings.c:305 -msgid "Nitzavim" -msgstr "Nitzavim" - -#: src/hdate_strings.c:282 src/hdate_strings.c:305 -msgid "Vayeilech" -msgstr "Vayeilech" - -#: src/hdate_strings.c:282 src/hdate_strings.c:305 -msgid "Ha'Azinu" -msgstr "Ha'Azinu" - -#: src/hdate_strings.c:283 src/hdate_strings.c:306 -msgid "Vezot Habracha" -msgstr "Vezot Habracha" - -#: src/hdate_strings.c:284 src/hdate_strings.c:307 -msgid "Vayakhel-Pekudei" -msgstr "Vayakhel-Pekudei" - -#: src/hdate_strings.c:284 src/hdate_strings.c:307 -msgid "Tazria-Metzora" -msgstr "Tazria-Metzora" - -#: src/hdate_strings.c:284 src/hdate_strings.c:307 -msgid "Achrei Mot-Kedoshim" -msgstr "Achrei Mot-Kedoshim" - -#: src/hdate_strings.c:285 src/hdate_strings.c:308 -msgid "Behar-Bechukotai" -msgstr "Behar-Bechukotai" - -#: src/hdate_strings.c:285 src/hdate_strings.c:308 -msgid "Chukat-Balak" -msgstr "Chukat-Balak" - -#: src/hdate_strings.c:285 src/hdate_strings.c:308 -msgid "Matot-Masei" -msgstr "Matot-Masei" - -#: src/hdate_strings.c:286 src/hdate_strings.c:309 -msgid "Nitzavim-Vayeilech" -msgstr "Nitzavim-Vayeilech" - -#: src/hdate_strings.c:364 src/hdate_strings.c:369 -msgid "Tishrei" -msgstr "Tishrei" - -#: src/hdate_strings.c:364 src/hdate_strings.c:369 -msgid "Cheshvan" -msgstr "Cheshvan" - -#: src/hdate_strings.c:364 src/hdate_strings.c:369 -msgid "Kislev" -msgstr "Kislev" - -#: src/hdate_strings.c:364 src/hdate_strings.c:369 -msgid "Tevet" -msgstr "Tevet" - -#: src/hdate_strings.c:365 src/hdate_strings.c:370 -msgid "Sh'vat" -msgstr "Sh'vat" - -#: src/hdate_strings.c:365 src/hdate_strings.c:370 -msgid "Adar" -msgstr "Adar" - -#: src/hdate_strings.c:365 src/hdate_strings.c:370 -msgid "Nisan" -msgstr "Nisan" - -#: src/hdate_strings.c:365 src/hdate_strings.c:370 -msgid "Iyyar" -msgstr "Iyyar" - -#: src/hdate_strings.c:366 src/hdate_strings.c:371 -msgid "Sivan" -msgstr "Sivan" - -#: src/hdate_strings.c:366 src/hdate_strings.c:371 -msgid "Tammuz" -msgstr "Tammuz" - -#: src/hdate_strings.c:366 src/hdate_strings.c:371 -msgid "Av" -msgstr "Av" - -#: src/hdate_strings.c:366 src/hdate_strings.c:371 -msgid "Elul" -msgstr "Elul" - -#: src/hdate_strings.c:366 src/hdate_strings.c:371 -msgid "Adar I" -msgstr "Adar I" - -#: src/hdate_strings.c:367 src/hdate_strings.c:372 -msgid "Adar II" -msgstr "Adar II" - -#: src/hdate_strings.c:384 -msgid "January" -msgstr "ဇန္နဝါရီ" - -#: src/hdate_strings.c:384 -msgid "February" -msgstr "ဖေဖော်ဝါရီ" - -#: src/hdate_strings.c:384 -msgid "March" -msgstr "မတ်" - -#: src/hdate_strings.c:385 -msgid "April" -msgstr "ဧပြီ" - -#: src/hdate_strings.c:385 src/hdate_strings.c:388 -msgid "May" -msgstr "မေ" - -#: src/hdate_strings.c:385 -msgid "June" -msgstr "ဇွန်" - -#: src/hdate_strings.c:386 -msgid "July" -msgstr "ဇူလိုင်" - -#: src/hdate_strings.c:386 -msgid "August" -msgstr "ဩဂုတ်" - -#: src/hdate_strings.c:386 -msgid "September" -msgstr "စက်တင်ဘာ" - -#: src/hdate_strings.c:387 -msgid "October" -msgstr "အောက်တိုဘာ" - -#: src/hdate_strings.c:387 -msgid "November" -msgstr "နိုဝင်ဘာ" - -#: src/hdate_strings.c:387 -msgid "December" -msgstr "ဒီဇင်ဘာ" - -#: src/hdate_strings.c:388 -msgid "Jan" -msgstr "Jan" - -#: src/hdate_strings.c:388 -msgid "Feb" -msgstr "Feb" - -#: src/hdate_strings.c:388 -msgid "Mar" -msgstr "Mar" - -#: src/hdate_strings.c:388 -msgid "Apr" -msgstr "Apr" - -#: src/hdate_strings.c:389 -msgid "Jun" -msgstr "Jun" - -#: src/hdate_strings.c:389 -msgid "Jul" -msgstr "Jul" - -#: src/hdate_strings.c:389 -msgid "Aug" -msgstr "Aug" - -#: src/hdate_strings.c:389 -msgid "Sep" -msgstr "Sep" - -#: src/hdate_strings.c:389 -msgid "Oct" -msgstr "Oct" - -#: src/hdate_strings.c:390 -msgid "Nov" -msgstr "Nov" - -#: src/hdate_strings.c:390 -msgid "Dec" -msgstr "Dec" - -#: src/hdate_strings.c:396 src/hdate_strings.c:416 -msgid "Rosh Hashana I" -msgstr "Rosh Hashana I" - -#: src/hdate_strings.c:396 src/hdate_strings.c:416 -msgid "Rosh Hashana II" -msgstr "Rosh Hashana II" - -#: src/hdate_strings.c:397 src/hdate_strings.c:417 -msgid "Tzom Gedaliah" -msgstr "Tzom Gedaliah" - -#: src/hdate_strings.c:397 src/hdate_strings.c:417 -msgid "Yom Kippur" -msgstr "Yom Kippur" - -#: src/hdate_strings.c:398 src/hdate_strings.c:418 -msgid "Sukkot" -msgstr "Sukkot" - -#: src/hdate_strings.c:398 src/hdate_strings.c:418 -msgid "Hol hamoed Sukkot" -msgstr "Hol hamoed Sukkot" - -#: src/hdate_strings.c:399 src/hdate_strings.c:419 -msgid "Hoshana raba" -msgstr "Hoshana raba" - -#: src/hdate_strings.c:399 src/hdate_strings.c:419 -msgid "Simchat Torah" -msgstr "Simchat Torah" - -#: src/hdate_strings.c:400 src/hdate_strings.c:420 -msgid "Chanukah" -msgstr "Chanukah" - -#: src/hdate_strings.c:400 src/hdate_strings.c:420 -msgid "Asara B'Tevet" -msgstr "Asara B'Tevet" - -#: src/hdate_strings.c:401 src/hdate_strings.c:421 -msgid "Tu B'Shvat" -msgstr "Tu B'Shvat" - -#: src/hdate_strings.c:401 src/hdate_strings.c:421 -msgid "Ta'anit Esther" -msgstr "Ta'anit Esther" - -#: src/hdate_strings.c:402 src/hdate_strings.c:422 -msgid "Purim" -msgstr "Purim" - -#: src/hdate_strings.c:402 src/hdate_strings.c:422 -msgid "Shushan Purim" -msgstr "Shushan Purim" - -#: src/hdate_strings.c:403 src/hdate_strings.c:423 -msgid "Pesach" -msgstr "Pesach" - -#: src/hdate_strings.c:403 src/hdate_strings.c:423 -msgid "Hol hamoed Pesach" -msgstr "Hol hamoed Pesach" - -#: src/hdate_strings.c:404 src/hdate_strings.c:424 -msgid "Yom HaAtzma'ut" -msgstr "Yom HaAtzma'ut" - -#: src/hdate_strings.c:404 src/hdate_strings.c:424 -msgid "Lag B'Omer" -msgstr "Lag B'Omer" - -#: src/hdate_strings.c:405 src/hdate_strings.c:425 -msgid "Erev Shavuot" -msgstr "Erev Shavuot" - -#: src/hdate_strings.c:405 src/hdate_strings.c:425 -msgid "Shavuot" -msgstr "Shavuot" - -#: src/hdate_strings.c:406 src/hdate_strings.c:426 -msgid "Tzom Tammuz" -msgstr "Tzom Tammuz" - -#: src/hdate_strings.c:406 src/hdate_strings.c:426 -msgid "Tish'a B'Av" -msgstr "Tish'a B'Av" - -#: src/hdate_strings.c:407 src/hdate_strings.c:427 -msgid "Tu B'Av" -msgstr "Tu B'Av" - -#: src/hdate_strings.c:407 src/hdate_strings.c:427 -msgid "Yom HaShoah" -msgstr "Yom HaShoah" - -#: src/hdate_strings.c:408 src/hdate_strings.c:428 -msgid "Yom HaZikaron" -msgstr "Yom HaZikaron" - -#: src/hdate_strings.c:408 src/hdate_strings.c:428 -msgid "Yom Yerushalayim" -msgstr "Yom Yerushalayim" - -#: src/hdate_strings.c:409 src/hdate_strings.c:429 -msgid "Shmini Atzeret" -msgstr "Shmini Atzeret" - -#: src/hdate_strings.c:409 src/hdate_strings.c:429 -msgid "Pesach VII" -msgstr "Pesach VII" - -#: src/hdate_strings.c:410 src/hdate_strings.c:430 -msgid "Pesach VIII" -msgstr "Pesach VIII" - -#: src/hdate_strings.c:410 src/hdate_strings.c:430 -msgid "Shavuot II" -msgstr "Shavuot II" - -#: src/hdate_strings.c:411 src/hdate_strings.c:431 -msgid "Sukkot II" -msgstr "Sukkot II" - -#: src/hdate_strings.c:411 src/hdate_strings.c:431 -msgid "Pesach II" -msgstr "Pesach II" - -#: src/hdate_strings.c:412 src/hdate_strings.c:432 -msgid "Family Day" -msgstr "မိသားစု ေန ့" - -#: src/hdate_strings.c:412 src/hdate_strings.c:432 -msgid "Memorial day for fallen whose place of burial is unknown" -msgstr "" -"ကျဆုံးခဲ့ပြီးမည်သည့်နေရာတွင်မြှုပ်နှံခဲ့သည်ကိုမသိရှိသောသူအတွက်အောက်မေ့ဖွယ်နေ့" - -#: src/hdate_strings.c:413 -msgid "Yitzhak Rabin memorial day" -msgstr "Yitzhak Rabin အောက်မေ့ဖွယ်နေ့" - -#: src/hdate_strings.c:413 -msgid "Zeev Zhabotinsky day" -msgstr "Zeev Zhabotinsky နေ့" - -#: src/hdate_strings.c:414 src/hdate_strings.c:434 -msgid "Erev Yom Kippur" -msgstr "Erev Yom Kippur" - -#: src/hdate_strings.c:433 -msgid "Rabin memorial day" -msgstr "Rabin memorial အောက်မေ့ဖွယ်နေ့" - -#: src/hdate_strings.c:433 -msgid "Zhabotinsky day" -msgstr "Zhabotinsky နေ့" - -#: src/hdate_strings.c:514 -msgid "in the Omer" -msgstr "Omer ထဲတွင်" - -#: examples/hcal/hcal.c:142 -msgid "" -"# configuration file for hcal - Hebrew calendar program\n" -"# part of package libhdate\n" -"#\n" -"# Should you mangle this file and wish to restore its default content,\n" -"# rename or delete this file and run hcal; hcal will automatically\n" -"# regenerate the default content.\n" -"#\n" -"# Your system administrator can set system-wide defaults for hcal by\n" -"# modifying file <not yet implemented>.\n" -"# You may override all defaults by changing the contents of this file.\n" -"#\n" -"# Version information\n" -"# This may be used by updates to hcal to determine how to parse the file\n" -"# and whether additional information and options should be appended to\n" -"# the end of this file.\n" -"VERSION=2.00\n" -"# Location awareness\n" -"# hcal wants to accurately highlight the current Hebrew day, including\n" -"# during the hours between sunset and secular midnight. If you don't\n" -"# provide it with latitude, longitude, and time zone information, hcal\n" -"# will try to guess the information, based upon your system timezone,\n" -"# and its (limited, and maybe biased) of the dominant Jewish community\n" -"# in that timezone. When hcal is forced to guess, it alerts the user\n" -"# with a message that includes the guessed location.\n" -"# hcal's guesses will also affect its default behaviour for output of\n" -"# Shabbat times, parshiot, and choice of Israel/diaspora hoidays\n" -"#SUNSET_AWARE=TRUE\n" -"# LATITUDE and LONGITUDE may be in decimal format or in the form\n" -"# degrees[:minutes[:seconds]] with the characters :'\" as possible\n" -"# delimiters. Use negative values to indicate South and West, or\n" -"# use the abbreviated compass directions N, S, E, W.\n" -"#LATITUDE=\n" -"#LONGITUDE=\n" -"# TIMEZONE may may be in decimal format or in the form degrees[:minutes]\n" -"# with the characters :'\" as possible delimiters.\n" -"#TIMEZONE=\n" -"\n" -"# Israel and the diaspora\n" -"# If hcal guesses that you're not in Israel, the DIASPORA option will be\n" -"# set true. This will affect holiday and parasha output. FORCE_ISRAEL\n" -"# forces hcal to display calendar information for Israel, using hcal's\n" -"# default coordinates foe Israel, or coordinates that you provide that\n" -"# seem legitmately within Israel.\n" -"# Thus, if you are living in Sao Paolo, and will be visiting Israel for\n" -"# Sukkot, set BOTH flags true in order to see holiday information for\n" -"# a non-resident vistor to Israel. The command line options for these\n" -"# features are --israel, -I, --diaspora, -d.\n" -"#FORCE_DIASPORA=FALSE;\n" -"#FORCE_ISRAEL=FALSE;\n" -"\n" -"# Shabbat related\n" -"# Setting SHABBAT_INFO true will output parshiot and Shabbat times.\n" -"# The command line options for these features are -p (--parasha), and\n" -"# -s (--shabbat). The CANDLE_LIGHTING field can accept a value of 18 - 90 " -"(minutes\n" -"# before sunset). The HAVDALAH field can accept a value of 20 - 90\n" -"# (minutes after sunset).\n" -"#PARASHA_NAMES=FALSE\n" -"#SHABBAT_INFO=FALSE\n" -"#CANDLE_LIGHTING=FALSE\n" -"#HAVDALAH=FALSE\n" -"\n" -"# Holiday identification\n" -"# hcal flags holidays by replacing the gregorian/Hebrew date separator\n" -"# with assorted unhelpful cryptic symbols. Setting FOOTNOTES to true\n" -"# will have hcal output after the month's calendar, a list of the month's\n" -"# holidays along with the days on which they occur.\n" -"#FOOTNOTE=FALSE\n" -"\n" -"# Output in hebrew characters\n" -"# hcal defaults to output all information in your default language, so\n" -"# if your default language is Hebrew, you're all set. Otherwise, you can\n" -"# set FORCE_HEBREW to true to output Hebrew information in Hebrew, while\n" -"# still outputting gregorian information in your default language. To\n" -"# output ALL information in Hebrew, run something like this:\n" -"# LC_TEMP=LC_ALL; LC_ALL=\"he_IL.UTF-8\"; hcal; LC_ALL=$LC_TEMP\n" -"# If setting FORCE_HEBREW to true results in 'garbage' or non-Hebrew\n" -"# output, you need to install a terminal font that includes the Hebrew\n" -"# character set (hint: unicode).\n" -"# The command line option for FORCE_HEBREW is either --hebrew or -H\n" -"#FORCE_HEBREW=FALSE\n" -"\n" -"# The FORCE_HEBREW option outputs data that is 'correct' and 'logical'.\n" -"# Unfortunately, the world can not be depended upon to be either. Most\n" -"# Xwindow applications will display the data fine with FORCE_HEBREW; most\n" -"# xterm implementations will not. (in fact, the only xterm clone I know\n" -"# of that comes close is mlterm). If using FORCE_HEBREW results in\n" -"# Hebrew characters being displayed in reverse, set OUTPUT_BIDI to true.\n" -"# This will reverse the order of the Hebrew characters, so they will\n" -"# display 'visual'ly correct; however, such output will not be suitable\n" -"# for piping or pasting to many other applications. Setting OUTPUT_BIDI\n" -"# automatically forces hebrew.\n" -"# The command line option for OUTPUT_BIDI is either --bidi, --visual, or -b\n" -"#OUTPUT_BIDI=FALSE\n" -"\n" -"# Display enhancements\n" -"# hcal defaults to display the current day in reverse video\n" -"# The command line option for this feature is --no-reverse\n" -"#SUPPRESS_REVERSE_VIDEO=FALSE;\n" -"# hcal can display its output \"calming, muted tones\". Note that piping\n" -"# colorized output may yield unexpected results.\n" -"#COLORIZE=FALSE\n" -"\n" -"# HTML OUTPUT\n" -"#OUTPUT_HTML=FALSE\n" -"#USE_EXTERNAL_CSS_FILE=\"pathto/foo/bar\"\n" -"\n" -"# Suppress alerts and warnings\n" -"# hcal alerts the user via STDERR when it guesses the user's location.\n" -"#QUIET_ALERTS=FALSE\n" -"\n" -"# Three month display\n" -"# hcal can display a previous, current and next month side-by-side. hcal\n" -"# can also display a calendar for an entire year in four rows of three\n" -"# months each. Note that this will display properly only if your console\n" -"# is set for at least 127 columns. Note also that setting this option to\n" -"# will cause options FOOTNOTES, SHABBAT, and PARASHA_NAMES to false.\n" -"#THREE_MONTH=FALSE\n" -"\n" -"# User-defined menus\n" -"# You may specify here command-line strings to optionally be parsed\n" -"# by hcal at execution time. To do so, use the command line option -m\n" -"# (--menu). hcal will process first the settings of this config file,\n" -"# then the other settings of your command line, and then will prompt\n" -"# you for which menu item you would like to select. hcal will process\n" -"# your menu selection as if it were a new command line, further modifying\n" -"# all the prior settings.\n" -"# Only the first ten \"MENU=\" entries will be read. Each line will be\n" -"# truncated at one hundred characters\n" -"#MENU= -l -23.55 -L -46.61 -z -3 # parents in Sao Paolo\n" -"#MENU= -l 32 -L 34 -z 2 # son in bnei brak\n" -"#MENU= -fbc -l 43.71 -L -79.43 -z -5 # me in Toronto\n" -"#MENU= -l 22.26 -L 114.15 -z 8 # supplier in Hong Kong\n" -msgstr "" - -#: examples/hcal/hcal.c:271 -msgid "" -"hcal - Hebrew calendar\n" -"version 1.6" -msgstr "" -"hcal - Hebrew ပြက္ခဒိန်\n" -"မူကွဲ 1.6" - -#: examples/hcal/hcal.c:281 -msgid "" -"Usage: hcal [options] [coordinates timezone] ] [[month] year]\n" -" coordinates: -l [NS]yy[.xxx] -L [EW]xx[.xxx]\n" -" -l [NS]yy[:mm[:ss]] -L [EW]xx[:mm[:ss]]\n" -" timezone: -z nn[( .nn | :mm )]\n" -"Try 'hcal --help' for more information" -msgstr "" -"Usage: hcal [options] [coordinates timezone] ] [[month] year]\n" -" coordinates: -l [NS]yy[.xxx] -L [EW]xx[.xxx]\n" -" -l [NS]yy[:mm[:ss]] -L [EW]xx[:mm[:ss]]\n" -" timezone: -z nn[( .nn | :mm )]\n" -"Try 'hcal --help' for more information" - -#: examples/hcal/hcal.c:295 -msgid "" -"Hebrew calendar\n" -"OPTIONS:\n" -" -1 --one-month over-ride config file setting if you had set\n" -" option --three-month as a default there\n" -" -3 --three-month displays previous/next months\n" -" side by side. requires 127 columns\n" -" -b --bidi prints hebrew in reverse (visual)\n" -" --visual\n" -" --no-bidi over-ride config file setting if you had set\n" -" --no-visual option -bidi as a default there\n" -" -c --colorize displays in calming, muted tones\n" -" --no-color over-ride a --colorize setting in your config file\n" -" -d --diaspora use diaspora reading and holidays.\n" -" -f --footnote print descriptive notes of holidays\n" -" --no-footnote over-ride a footnote setting in your config file\n" -" -h --html output in html format to stdout\n" -" -H --hebrew print hebrew information in Hebrew\n" -" -i use external css file \"./hcal.css\".\n" -" -I --israel override a diaspora default\n" -" --no-reverse do not highlight today's date\n" -" -m --menu prompt user-defined menu from config file\n" -" -p --parasha print week's parasha on each calendar row\n" -" -q --quiet-alerts suppress warning messages\n" -" -s --shabbat print Shabbat times and parshiot\n" -" --candles modify default minhag of 20 minutes. (17<n<91)\n" -" --havdalah modify default minhag of 3 stars. (19<n<91 minutes)\n" -" -z --timezone nn timezone, +/-UTC\n" -" -l --latitude yy latitude yy degrees. Negative values are South\n" -" -L --longitude xx longitude xx degrees. Negative values are West\n" -"\n" -"All options can be made default in the config file, or menu-ized for\n" -"easy selection." -msgstr "" - -#: examples/hcal/hcal.c:1868 -msgid "" -"ALERT: options --parasha, --shabbat, --footnote are not supported in 'three-" -"month' mode" -msgstr "" -"သတိပေးချက် - options --parasha, --shabbat, --footnote များသည် 'သုံးလ' " -"နည်းလမ်းကိုမထောက်ခံပါ" - -#: examples/hcal/hcal.c:1940 examples/hcal/local_functions.c:92 -#: examples/hcal/local_functions.c:99 examples/hcal/local_functions.c:112 -#: examples/hcal/local_functions.c:486 examples/hcal/local_functions.c:491 -msgid "error" -msgstr "မှားယွင်းချက်" - -#: examples/hcal/hcal.c:1940 -msgid "too many parameters received. expected [[mm] [yyyy]" -msgstr "" -"ကန္ ့သတ္ခ်က္ေၿမာက္မ်ားစြာကိုလက္ခံရရွိခဲ့သည္။ ေမွ်ာ္လင့္ [[mm] [yyyy]" - -#: examples/hcal/hcal.c:1949 examples/hcal/hdate.c:1929 -#: examples/hcal/hdate.c:2003 examples/hcal/hdate.c:2100 -msgid "year" -msgstr "နှစ်" - -#: examples/hcal/hcal.c:1957 examples/hcal/hdate.c:2013 -#: examples/hcal/hdate.c:2016 examples/hcal/hdate.c:2070 -#: examples/hcal/hdate.c:2110 examples/hcal/hdate.c:2113 -#: examples/hcal/hdate.c:2132 -msgid "month" -msgstr "လ" - -#: examples/hcal/hdate.c:42 -msgid "sunrise" -msgstr "နေထွက်ချိန်" - -#: examples/hcal/hdate.c:43 -msgid "sunset" -msgstr "နေဝင်ချိန်" - -#: examples/hcal/hdate.c:44 -msgid "first_light" -msgstr "ပထမဆုံး_အလင်းရောင်" - -#: examples/hcal/hdate.c:45 -msgid "talit" -msgstr "talit" - -#: examples/hcal/hdate.c:46 -msgid "midday" -msgstr "နေ့လည်" - -#: examples/hcal/hdate.c:47 -msgid "first_stars" -msgstr "ပထမဆုံး_ကြယ်များ" - -#: examples/hcal/hdate.c:48 -msgid "three_stars" -msgstr "သုံး_ကြယ်များ" - -#: examples/hcal/hdate.c:49 examples/hcal/hdate.c:635 -msgid "sun_hour" -msgstr "sun_hour" - -#: examples/hcal/hdate.c:50 -msgid "candle-lighting" -msgstr "ဖယောင်းတိုင်- မီးထွန်းခြင်း" - -#: examples/hcal/hdate.c:51 -msgid "havdalah" -msgstr "havdalah" - -#: examples/hcal/hdate.c:81 -msgid "" -"# configuration file for hdate - Hebrew date information program\n" -"# part of package libhdate\n" -"#\n" -"# Should you mangle this file and wish to restore its default content,\n" -"# rename or delete this file and run hdate; hdate will automatically\n" -"# regenerate the default content.\n" -"#\n" -"# Your system administrator can set system-wide defaults for hcal by\n" -"# modifying file <not yet implemented>.\n" -"# You may override all defaults by changing the contents of this file.\n" -"#\n" -"# Version information\n" -"# This may be used by updates to hcal to determine how to parse the file\n" -"# and whether additional information and options should be appended to\n" -"# the end of this file.\n" -"VERSION=2.00\n" -"#\n" -"# Location awareness\n" -"# hdate wants to accurately highlight the current Hebrew day, including\n" -"# during the hours between sunset and secular midnight. If you don't\n" -"# provide it with latitude, longitude, and time zone information, hdate\n" -"# will try to guess the information, based upon your system timezone,\n" -"# and its (limited, and maybe biased) of the dominant Jewish community\n" -"# in that timezone. When hdate is forced to guess, it alerts the user\n" -"# with a message that includes the guessed location.\n" -"# hdate's guesses will also affect its default behaviour for output of\n" -"# Shabbat times, parshiot, and choice of Israel/diaspora hoidays.\n" -"#SUNSET_AWARE=TRUE\n" -"# LATITUDE and LONGITUDE may be in decimal format or in the form\n" -"# degrees[:minutes[:seconds]] with the characters :'\" as possible\n" -"# delimiters. Use negative values to indicate South and West, or\n" -"# use the abbreviated compass directions N, S, E, W.\n" -"#LATITUDE=\n" -"#LONGITUDE=\n" -"# TIMEZONE may may be in decimal format or in the form degrees[:minutes]\n" -"# with the characters :'\" as possible delimiters.\n" -"#TIMEZONE=\n" -"\n" -"# Output in hebrew characters\n" -"# hdate defaults to output all information in your default language, so\n" -"# if your default language is Hebrew, you're all set. Otherwise, you can\n" -"# set FORCE_HEBREW to true to output Hebrew information in Hebrew, while\n" -"# still outputting gregorian information in your default language. To\n" -"# output ALL information in Hebrew, run something like this:\n" -"# LC_TEMP=LC_ALL; LC_ALL=\"he_IL.UTF-8\"; hdate; LC_ALL=$LC_TEMP\n" -"# If setting FORCE_HEBREW to true results in 'garbage' or non-Hebrew\n" -"# output, you need to install a terminal font that includes the Hebrew\n" -"# character set (hint: unicode).\n" -"#FORCE_HEBREW=FALSE\n" -"\n" -"# The FORCE_HEBREW option outputs data that is 'correct' and 'logical'.\n" -"# Unfortunately, the world can not be depended upon to be either. Most\n" -"# Xwindow applications will display the data fine with FORCE_HEBREW; most\n" -"# xterm implementations will not. (in fact, the only xterm clone I know\n" -"# of that comes close is mlterm). If using FORCE_HEBREW results in\n" -"# Hebrew characters being displayed in reverse, set OUTPUT_BIDI to true.\n" -"# This will reverse the order of the Hebrew characters, so they will\n" -"# display 'visual'ly correct; however, such output will not be suitable\n" -"# for piping or pasting to many other applications. Setting OUTPUT_BIDI\n" -"# automatically forces hebrew.\n" -"#OUTPUT_BIDI=FALSE\n" -"\n" -"# The Hebrew language output of Hebrew information can also be 'styled'\n" -"# in the following ways:\n" -"# option YOM ~> yom shishi, aleph tishrei ...\n" -"# option LESHABBAT ~> yom sheni leshabbat miketz, kof kislev ...\n" -"# option LESEDER ~> yom sheni leseder miketz, kof kislev ...\n" -"#YOM=FALSE\n" -"#LESHABBAT=FALSE\n" -"#LESEDER=FALSE\n" -"\n" -"#SUN_RISE_SET=FALSE\n" -"#TIMES_OF_DAY=FALSE\n" -"#SHORT_FORMAT=FALSE\n" -"#SEFIRAT_HAOMER=FALSE\n" -"#DIASPORA=FALSE\n" -"\n" -"\n" -"# Shabbat related\n" -"# Setting SHABBAT_INFO true will output parshiot and Shabbat times.\n" -"# The command line options for these features are -r (--parasha), and\n" -"# -c. The CANDLE_LIGHTING field can accept a value of 18 - 90 (minutes\n" -"# before sunset). The HAVDALAH field can accept a value of 20 - 90\n" -"# (minutes after sunset).\n" -"#PARASHA_NAMES=FALSE\n" -"#ONLY_IF_PARASHA_IS_READ=FALSE\n" -"#SHABBAT_INFO=FALSE\n" -"\n" -"#CANDLE_LIGHTING=FALSE\n" -"#HAVDALAH=FALSE\n" -"\n" -"# Holiday related\n" -"#HOLIDAYS=FALSE\n" -"#ONLY_IF_HOLIDAY=FALSE\n" -"\n" -"# Tabular output\n" -"# This option has hdate output the information you request in a single\n" -"# comma-delimited line per day, suitable for piping or import to\n" -"# spreadsheet formatting applications, etc. To belabor the obvious,\n" -"# try running - ./hdate 12 2011 -Rt --table |column -s, -t \n" -"# The command line option for this feature is, um, --table\n" -"#TABULAR=FALSE\n" -"\n" -"# iCal format\n" -"# hdate can output its information in iCal-compatable format\n" -"# ICAL=FALSE\n" -"# Suppress alerts and warnings\n" -"# hdate alerts the user via STDERR when it guesses the user's location.\n" -"#QUIET_ALERTS=FALSE\n" -"\n" -"# Julian day number\n" -"# The Julian day number is a .... See ... for more details.\n" -"# setting the option JULIAN_DAY will have hdate output that number in\n" -"# the format JDN-nnnnnnn at the beginning of its first line of output.\n" -"#JULIAN_DAY=FALSE\n" -"\n" -"# User-defined menus\n" -"# You may specify here command-line strings to optionally be parsed\n" -"# by hcal at execution time. To do so, use the command line option -m\n" -"# (--menu). hcal will process first the settings of this config file,\n" -"# then the other settings of your command line, and then will prompt\n" -"# you for which menu item you would like to select. hcal will process\n" -"# your menu selection as if it were a new command line, further modifying\n" -"# all the prior settings.\n" -"# Only the first ten \"MENU=\" entries will be read. Each line will be\n" -"# truncated at one hundred characters\n" -"#MENU= -bd -l -23.55 -L -46.61 -z -3 # parents in Sao Paolo\n" -"#MENU= -b -l 32 -L 34 -z 2 # son in bnei brak\n" -"#MENU= -bd -l 43.71 -L -79.43 -z -5 # me in Toronto\n" -"#MENU= -bd -l 22.26 -L 114.15 -z 8 # supplier in Hong Kong\n" -msgstr "" - -#: examples/hcal/hdate.c:209 -msgid "" -"hdate - display Hebrew date information\n" -"version 1.6" -msgstr "" -"hdate - Hebrew ရက်စွဲအချက်အလက်ကိုထုတ်ဖော်ပြသည်\n" -"မူကွဲ 1.6" - -#: examples/hcal/hdate.c:219 -msgid "" -"Usage: hdate [options] [coordinates timezone] [[[day] month] year]\n" -" hdate [options] [coordinates timezone] [julian_day]\n" -"\n" -" coordinates: -l [NS]yy[.yyy] -L [EW]xx[.xxx]\n" -" -l [NS]yy[:mm[:ss]] -L [EW]xx[:mm[:ss]]\n" -" timezone: -z nn[( .nn | :mm )]\n" -"Try 'hdate --help' for more information" -msgstr "" -"Usage: hdate [options] [coordinates timezone] [[[day] month] year]\n" -" hdate [options] [coordinates timezone] [julian_day]\n" -"\n" -" coordinates: -l [NS]yy[.yyy] -L [EW]xx[.xxx]\n" -" -l [NS]yy[:mm[:ss]] -L [EW]xx[:mm[:ss]]\n" -" timezone: -z nn[( .nn | :mm )]\n" -"Try 'hdate --help' for more information" - -#: examples/hcal/hdate.c:235 -msgid "" -"hdate - display Hebrew date information\n" -"OPTIONS:\n" -" -b --bidi prints hebrew in reverse (visual)\n" -" --visual\n" -" -c print Shabbat start/end times.\n" -" --candles modify default minhag of 20 minutes. (17<n<91)\n" -" --havdalah modify default minhag of 3 stars. (19<n<91 minutes)\n" -" -d --diaspora use diaspora reading and holidays.\n" -" -h --holidays print holidays.\n" -" -H print only it is a holiday.\n" -" -i --ical use iCal formated output.\n" -" -j --julian print Julian day number.\n" -" -m --menu prompt user-defined menu from config file\n" -" -o --omer print Sefirat Haomer.\n" -" -q --quiet-alerts suppress warning messages\n" -" -r --parasha print weekly reading on saturday.\n" -" -R print only if there is a weekly reading on Shabbat.\n" -" -s --sun print sunrise/sunset times.\n" -" -S --short-format print using short format.\n" -" -t print day times: first light, talit, sunrise,\n" -" midday, sunset, first stars, three stars.\n" -" -T --table tabular output, suitable for spreadsheets\n" -"\n" -" -z --timezone nn timezone, +/-UTC\n" -" -l --latitude yy latitude yy degrees. Negative values are South\n" -" -L --longitude xx longitude xx degrees. Negative values are West\n" -"\n" -" --hebrew forces Hebrew to print in Hebrew characters\n" -" --yom force Hebrew prefix to Hebrew day of week\n" -" --leshabbat insert parasha between day of week and day\n" -" --leseder insert parasha between day of week and day\n" -" --not-sunset-aware don't display next day if after sunset\n" -"\n" -"All options can be made default in the config file, or menu-ized for\n" -"easy selection." -msgstr "" - -#: examples/hcal/hdate.c:274 -msgid "" -"ALERT: The information displayed is for today's Hebrew date.\n" -" Because it is now after sunset, that means the data is\n" -" for the Gregorian day beginning at midnight." -msgstr "" - -#: examples/hcal/hdate.c:405 -msgid "eve of " -msgstr "eve of " - -#: examples/hcal/hdate.c:669 -msgid "today is day" -msgstr "ယနေ့သည်နေ့ဖြစ်သည်" - -#: examples/hcal/hdate.c:743 -msgid "Gregorian date" -msgstr "Gregorian ရက်စွဲ" - -#: examples/hcal/hdate.c:743 -msgid "Hebrew Date" -msgstr "Hebrew ရက်စွဲ" - -#: examples/hcal/hdate.c:748 -msgid "holiday" -msgstr "အားလပ်ရက်များ။ ပိတ်ရက်" - -#: examples/hcal/hdate.c:749 -msgid "omer count" -msgstr "omer count" - -#: examples/hcal/hdate.c:750 -msgid "parashat" -msgstr "parashat" - -#: examples/hcal/hdate.c:1016 -msgid "Parashat" -msgstr "Parashat" - -#: examples/hcal/hdate.c:2120 examples/hcal/hdate.c:2139 -msgid "day" -msgstr "နေ့" - -#: examples/hcal/hdate.c:2168 -msgid "too many arguments; after options max is dd mm yyyy" -msgstr "" - -#: examples/hcal/local_functions.c:93 -msgid "parameter" -msgstr "ကန့်သတ်ချက်ဘောင်" - -#: examples/hcal/local_functions.c:94 -msgid "is non-numeric or out of bounds" -msgstr "" - -#: examples/hcal/local_functions.c:100 examples/hcal/local_functions.c:113 -msgid "option" -msgstr "ရွေးချယ်နိုင်သည့်အခွင့်အရေး" - -#: examples/hcal/local_functions.c:100 -msgid "missing parameter" -msgstr "ပျောက်ဆုံးနေသောကန့်သတ်ချက်ဘောင်" - -#: examples/hcal/local_functions.c:106 -msgid "ALERT: time zone not entered, using system local time zone" -msgstr "" -"သတိပေးချက် - " -"အချိန်အပိုင်းအခြားမထည့်သွင့်ထားပါ၊စနစ်အတွင်းပိုင်း၏အချိန်အပိုင်းခြားကိုအသုံးပ" -"ြုနေသည်" - -#: examples/hcal/local_functions.c:113 -msgid "is not a valid option" -msgstr "ခိုင်လုံသောရွေးချယ်ပိုင်ခွင့်မဟုတ်ပါ" - -#: examples/hcal/local_functions.c:130 -msgid "ALERT: guessing... will use co-ordinates for" -msgstr "" - -#: examples/hcal/local_functions.c:138 -msgid "Los Angeles" -msgstr "Los Angeles" - -#: examples/hcal/local_functions.c:139 -msgid "Mexico City" -msgstr "Mexico မြို့" - -#: examples/hcal/local_functions.c:140 -msgid "New York City" -msgstr "New York မြို့" - -#: examples/hcal/local_functions.c:143 -msgid "Buenos Aires" -msgstr "Buenos Aires" - -#: examples/hcal/local_functions.c:144 -msgid "London" -msgstr "London" - -#: examples/hcal/local_functions.c:145 -msgid "Paris" -msgstr "Paris" - -#: examples/hcal/local_functions.c:146 -msgid "Tel-Aviv" -msgstr "Tel-Aviv" - -#: examples/hcal/local_functions.c:147 -msgid "Moscow" -msgstr "Moscow" - -#: examples/hcal/local_functions.c:148 -msgid "Tashkent" -msgstr "Tashkent" - -#: examples/hcal/local_functions.c:149 -msgid "Beijing" -msgstr "Beijing" - -#: examples/hcal/local_functions.c:151 -msgid "Honolulu" -msgstr "Honolulu" - -#: examples/hcal/local_functions.c:152 -msgid "Hmmm, ... hate to do this, really ..." -msgstr "" - -#: examples/hcal/local_functions.c:152 -msgid "using co-ordinates for the equator, at the center of time zone" -msgstr "" - -#: examples/hcal/local_functions.c:318 examples/hcal/local_functions.c:332 -#: examples/hcal/local_functions.c:333 -msgid "l (latitude)" -msgstr "l (latitude)" - -#: examples/hcal/local_functions.c:319 -msgid "L (Longitue)" -msgstr "L (Longitue)" - -#: examples/hcal/local_functions.c:365 examples/hcal/local_functions.c:379 -#: examples/hcal/local_functions.c:380 examples/hcal/local_functions.c:411 -msgid "L (Longitude)" -msgstr "L (Longitude)" - -#: examples/hcal/local_functions.c:442 -msgid "z (time zone)" -msgstr "z (time zone)" - -#: examples/hcal/local_functions.c:462 -msgid "z (timezone)" -msgstr "z (timezone)" - -#: examples/hcal/local_functions.c:486 -msgid "valid longitude parameter missing for given latitude" -msgstr "" - -#: examples/hcal/local_functions.c:491 -msgid "valid latitude parameter missing for given longitude" -msgstr "" - -#: examples/hcal/local_functions.c:529 -msgid "time zone value of" -msgstr "" - -#: examples/hcal/local_functions.c:530 -msgid "is incompatible with a longitude of" -msgstr "" - -#: examples/hcal/local_functions.c:530 -msgid "degrees" -msgstr "degrees" - -#: examples/hcal/local_functions.c:638 -msgid "" -"This seems to be to be your first time using this version.\n" -"Please read the new documentation in the man page and config\n" -"file. Attempting to create a config file ..." -msgstr "" - -#: examples/hcal/local_functions.c:677 -msgid "failure attempting to create config file" -msgstr "" - -#: examples/hcal/local_functions.c:681 -msgid "config file created" -msgstr "ချိန်ညှိခြင်းဖိုင်ကိုဖန်တီးနိုင်ခဲ့သည်" - -#: examples/hcal/local_functions.c:682 -msgid "failure closing" -msgstr "မေအာင္ၿမင္ေသာပိတ္ၿခင္း" - -#: examples/hcal/local_functions.c:702 -msgid "memory allocation failure" -msgstr "မအောင်မြင်သောမှတ်ဥာဏ်ခွဲဝေသတ်မှတ်ချက်" - -#: examples/hcal/local_functions.c:916 -msgid "your custom menu options (from your config file)" -msgstr "" - -#: examples/hcal/local_functions.c:922 -msgid "ALERT: -m (--menu) option specified, but no menu items in config file" -msgstr "" - -#: examples/hcal/local_functions.c:925 -msgid "enter your selection, or <return> to continue" -msgstr "" -"သင်၏ရွေးချယ်မှ ုကိုထည့်သွင်းပါ (သို့မဟုတ်) enter ကိုနှိပ်ပြီးရှေ့ဆက်ပါ" - -#: examples/hcal/local_functions.c:929 -msgid "menu selection received was out of bounds" -msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libvirt.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libvirt.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libvirt.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libvirt.po 2016-04-15 08:51:12.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:18+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:58+0000\n" +"X-Generator: Launchpad (build 17995)\n" "Language: my\n" #: daemon/admin_dispatch.h:64 daemon/qemu_dispatch.h:96 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libwnck.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libwnck.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/libwnck.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/libwnck.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,1187 +0,0 @@ -# Burmese translation for libwnck -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the libwnck package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: libwnck\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2015-12-03 23:36+0000\n" -"PO-Revision-Date: 2015-05-09 18:24+0000\n" -"Last-Translator: Rockworld <sumoisrock@gmail.com>\n" -"Language-Team: Burmese <my@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:18+0000\n" -"X-Generator: Launchpad (build 17958)\n" - -#. * -#. * SECTION:application -#. * @short_description: an object representing a group of windows of the same -#. * application. -#. * @see_also: wnck_window_get_application() -#. * @stability: Unstable -#. * -#. * The #WnckApplication is a group of #WnckWindow that are all in the same -#. * application. It can be used to represent windows by applications, group -#. * windows by applications or to manipulate all windows of a particular -#. * application. -#. * -#. * A #WnckApplication is identified by the group leader of the #WnckWindow -#. * belonging to it, and new #WnckWindow are added to a #WnckApplication if and -#. * only if they have the group leader of the #WnckApplication. -#. * -#. * The #WnckApplication objects are always owned by libwnck and must not be -#. * referenced or unreferenced. -#. -#: ../libwnck/application.c:49 -msgid "Untitled application" -msgstr "အမည်မဲ့ application" - -#: ../libwnck/pager-accessible.c:340 -msgid "Workspace Switcher" -msgstr "အလုပ်လုပ်သည့်နေရာ ပြောင်းရန်" - -#: ../libwnck/pager-accessible.c:351 -msgid "Tool to switch between workspaces" -msgstr "အလုပ်လုပ်သည့်နေရာများပြောင်းရန်အတွက် Tool" - -#: ../libwnck/pager-accessible.c:463 -#, c-format -msgid "Click this to switch to workspace %s" -msgstr "အလုပ်လုပ်သည့်နေရာ %s ကို ပြောင်းဖို့ ဒီဟာကို ကလစ်နှိပ်ပါ။" - -#: ../libwnck/pager.c:2151 -#, c-format -msgid "Click to start dragging \"%s\"" -msgstr "စဆွဲရန်အတွက် %s ကိုကလစ်နှိပ်ပါ။" - -#: ../libwnck/pager.c:2154 -#, c-format -msgid "Current workspace: \"%s\"" -msgstr "ယခုလက်ရှိအလုပ်လုပ်နေသည့်နေရာ - \"%s\"" - -#: ../libwnck/pager.c:2159 -#, c-format -msgid "Click to switch to \"%s\"" -msgstr "\"%s\" ကိုပြောင်းဖို့ ကလစ်နှိပ်ပါ။" - -#: ../libwnck/selector.c:1186 -msgid "No Windows Open" -msgstr "" - -#: ../libwnck/selector.c:1242 -msgid "Window Selector" -msgstr "Window Selector" - -#: ../libwnck/selector.c:1243 -msgid "Tool to switch between windows" -msgstr "" - -#: ../libwnck/tasklist.c:601 -msgid "Window List" -msgstr "Window စာရင်း" - -#: ../libwnck/tasklist.c:602 -msgid "Tool to switch between visible windows" -msgstr "" - -#: ../libwnck/tasklist.c:2981 -msgid "Mi_nimize All" -msgstr "_n အားလုံးကိုချုံမည်။" - -#: ../libwnck/tasklist.c:2989 -msgid "Un_minimize All" -msgstr "_m အားလုံးကိုပြန်ဖွင့်မည်။" - -#: ../libwnck/tasklist.c:2997 -msgid "Ma_ximize All" -msgstr "_x အားလုံးကိုအကြီးချဲ့မည်။" - -#: ../libwnck/tasklist.c:3005 -msgid "_Unmaximize All" -msgstr "_U အားလုံးကိုပြန်ချုံမည်။" - -#: ../libwnck/tasklist.c:3017 -msgid "_Close All" -msgstr "_C အားလုံးပိတ်" - -#: ../libwnck/window-action-menu.c:368 -msgid "Unmi_nimize" -msgstr "" - -#: ../libwnck/window-action-menu.c:374 -msgid "Mi_nimize" -msgstr "_n ချုံမည်။" - -#: ../libwnck/window-action-menu.c:381 -msgid "Unma_ximize" -msgstr "" - -#: ../libwnck/window-action-menu.c:387 -msgid "Ma_ximize" -msgstr "_x ချဲ့မည်" - -#: ../libwnck/window-action-menu.c:693 ../libwnck/workspace.c:271 -#, c-format -msgid "Workspace %d" -msgstr "အလုပ်လုပ်သည့်နေရာ %d" - -#: ../libwnck/window-action-menu.c:702 ../libwnck/window-action-menu.c:848 -#, c-format -msgid "Workspace 1_0" -msgstr "Workspace 1_0" - -#: ../libwnck/window-action-menu.c:704 ../libwnck/window-action-menu.c:850 -#, c-format -msgid "Workspace %s%d" -msgstr "အလုပ်လုပ်သည့်နေရာ %s%d" - -#: ../libwnck/window-action-menu.c:991 -msgid "_Move" -msgstr "_M ရွှေ့ရန်" - -#: ../libwnck/window-action-menu.c:997 -msgid "_Resize" -msgstr "_Rအရွယ်ပြန်ညှိပါ" - -#: ../libwnck/window-action-menu.c:1005 -msgid "Always On _Top" -msgstr "_T အမြဲတမ်းအပေါ်မှာထားမည်။" - -#: ../libwnck/window-action-menu.c:1013 -msgid "_Always on Visible Workspace" -msgstr "_A မြင်ရသည့်အလုပ်လုပ်သည့်နေရာမှာ အမြဲတမ်း" - -#: ../libwnck/window-action-menu.c:1018 -msgid "_Only on This Workspace" -msgstr "_O ဒီအလုပ်လုပ်သည့်နေရာတွင်သာ" - -#: ../libwnck/window-action-menu.c:1025 -msgid "Move to Workspace _Left" -msgstr "_L ဘယ်ဖက်က အလုပ်လုပ်သည့်နေရာသို့ရွှေ့မည်။" - -#: ../libwnck/window-action-menu.c:1030 -msgid "Move to Workspace R_ight" -msgstr "_i အလုပ်လုပ်သည့်နေရာ ညာဖက်သို့ရွှေ့မည်။" - -#: ../libwnck/window-action-menu.c:1035 -msgid "Move to Workspace _Up" -msgstr "_U အလုပ်လုပ်သည့်နေရာ အပေါ်သို့ရွှေ့မည်။" - -#: ../libwnck/window-action-menu.c:1040 -msgid "Move to Workspace _Down" -msgstr "_D အလုပ်လုပ်သည့်နေရာ အောက်သို့ရွှေ့မည်။" - -#: ../libwnck/window-action-menu.c:1042 -msgid "Move to Another _Workspace" -msgstr "_W တခြားအလုပ်လုပ်သည့်နေရာသို့ရွှေ့မည်။" - -#: ../libwnck/window-action-menu.c:1062 -msgid "_Close" -msgstr "_ပိတ်မည်။" - -#. * -#. * SECTION:window -#. * @short_description: an object representing a window. -#. * @see_also: #WnckWorkspace, #WnckApplication, #WnckClassGroup -#. * @stability: Unstable -#. * -#. * The #WnckWindow objects are always owned by libwnck and must not be -#. * referenced or unreferenced. -#. -#: ../libwnck/window.c:47 -msgid "Untitled window" -msgstr "အမည်မဲ့ window" - -#: ../libwnck/wnckprop.c:137 -msgid "X window ID of the window to examine or modify" -msgstr "X window ID of the window to examine or modify" - -#: ../libwnck/wnckprop.c:137 ../libwnck/wnckprop.c:144 -#: ../libwnck/wnckprop.c:154 -msgid "XID" -msgstr "XID" - -#. Translators: A group leader is the window that is the "owner" of a -#. * group of windows, ie: if you have multiple windows in one -#. * application, one window has some information about the application -#. * (like the application name). -#: ../libwnck/wnckprop.c:143 -msgid "X window ID of the group leader of an application to examine" -msgstr "X window ID of the group leader of an application to examine" - -#. Translators: A class is like a "family". E.g., all gvim windows -#. * are of the same class. -#: ../libwnck/wnckprop.c:148 -msgid "Class resource of the class group to examine" -msgstr "Class resource of the class group to examine" - -#: ../libwnck/wnckprop.c:148 -msgid "CLASS" -msgstr "အမျိုးအစား" - -#: ../libwnck/wnckprop.c:150 -msgid "NUMBER of the workspace to examine or modify" -msgstr "NUMBER of the workspace to examine or modify" - -#: ../libwnck/wnckprop.c:150 ../libwnck/wnckprop.c:152 -#: ../libwnck/wnckprop.c:170 ../libwnck/wnckprop.c:172 -#: ../libwnck/wnckprop.c:174 ../libwnck/wnckprop.c:271 -msgid "NUMBER" -msgstr "နံပါတ်" - -#: ../libwnck/wnckprop.c:152 -msgid "NUMBER of the screen to examine or modify" -msgstr "" - -#: ../libwnck/wnckprop.c:154 -msgid "Alias of --window" -msgstr "" - -#. Translators: A class is like a "family". E.g., all gvim windows -#. * are of the same class. -#: ../libwnck/wnckprop.c:162 -msgid "" -"List windows of the application/class group/workspace/screen (output format: " -"\"XID: Window Name\")" -msgstr "" -"List windows of the application/class group/workspace/screen (output format: " -"\"XID: Window Name\")" - -#: ../libwnck/wnckprop.c:164 -msgid "" -"List workspaces of the screen (output format: \"Number: Workspace Name\")" -msgstr "" -"List workspaces of the screen (output format: \"Number: Workspace Name\")" - -#: ../libwnck/wnckprop.c:170 -msgid "Change the number of workspaces of the screen to NUMBER" -msgstr "" - -#: ../libwnck/wnckprop.c:172 -msgid "Change the workspace layout of the screen to use NUMBER rows" -msgstr "" - -#: ../libwnck/wnckprop.c:174 -msgid "Change the workspace layout of the screen to use NUMBER columns" -msgstr "" - -#: ../libwnck/wnckprop.c:176 -msgid "Show the desktop" -msgstr "Desktop ကိုပြပါ။" - -#: ../libwnck/wnckprop.c:178 -msgid "Stop showing the desktop" -msgstr "Desktop ကိုပြခြင်း ရပ်မည်။" - -#. Translators: 'viewport' is kind of the viewable area. A viewport -#. * can be used to implement workspaces (e.g. compiz is an example); -#. * however it is not just the current workspace. -#: ../libwnck/wnckprop.c:183 -msgid "Move the viewport of the current workspace to X coordinate X" -msgstr "" - -#: ../libwnck/wnckprop.c:183 ../libwnck/wnckprop.c:273 -msgid "X" -msgstr "X" - -#. Translators: 'viewport' is kind of the viewable area. A viewport -#. * can be used to implement workspaces (e.g. compiz is an example); -#. * however it is not just the current workspace. -#: ../libwnck/wnckprop.c:188 -msgid "Move the viewport of the current workspace to Y coordinate Y" -msgstr "" - -#: ../libwnck/wnckprop.c:188 ../libwnck/wnckprop.c:275 -msgid "Y" -msgstr "Y" - -#: ../libwnck/wnckprop.c:194 -msgid "Minimize the window" -msgstr "ဝင်းဒိုးကိုချုံ့မည်" - -#: ../libwnck/wnckprop.c:196 -msgid "Unminimize the window" -msgstr "" - -#: ../libwnck/wnckprop.c:198 -msgid "Maximize the window" -msgstr "ဝင်းဒိုးကိုချဲ့မည်" - -#: ../libwnck/wnckprop.c:200 -msgid "Unmaximize the window" -msgstr "" - -#: ../libwnck/wnckprop.c:202 -msgid "Maximize horizontally the window" -msgstr "" - -#: ../libwnck/wnckprop.c:204 -msgid "Unmaximize horizontally the window" -msgstr "" - -#: ../libwnck/wnckprop.c:206 -msgid "Maximize vertically the window" -msgstr "" - -#: ../libwnck/wnckprop.c:208 -msgid "Unmaximize vertically the window" -msgstr "" - -#: ../libwnck/wnckprop.c:210 -msgid "Start moving the window via the keyboard" -msgstr "" - -#: ../libwnck/wnckprop.c:212 -msgid "Start resizing the window via the keyboard" -msgstr "" - -#: ../libwnck/wnckprop.c:214 -msgid "Activate the window" -msgstr "" - -#: ../libwnck/wnckprop.c:216 -msgid "Close the window" -msgstr "Close the window" - -#: ../libwnck/wnckprop.c:219 -msgid "Make the window fullscreen" -msgstr "" - -#: ../libwnck/wnckprop.c:221 -msgid "Make the window quit fullscreen mode" -msgstr "" - -#: ../libwnck/wnckprop.c:223 -msgid "Make the window always on top" -msgstr "ဝင်းဒိုးကိုအမြဲအပေါ်တွင်ထားမည်" - -#: ../libwnck/wnckprop.c:225 -msgid "Make the window not always on top" -msgstr "" - -#: ../libwnck/wnckprop.c:227 -msgid "Make the window below other windows" -msgstr "" - -#: ../libwnck/wnckprop.c:229 -msgid "Make the window not below other windows" -msgstr "" - -#: ../libwnck/wnckprop.c:231 -msgid "Shade the window" -msgstr "" - -#: ../libwnck/wnckprop.c:233 -msgid "Unshade the window" -msgstr "" - -#. Translators: 'viewport' is kind of the viewable area. A viewport -#. * can be used to implement workspaces (e.g. compiz is an example); -#. * however it is not just the current workspace. -#: ../libwnck/wnckprop.c:238 -msgid "Make the window have a fixed position in the viewport" -msgstr "" - -#. Translators: 'viewport' is kind of the viewable area. A viewport -#. * can be used to implement workspaces (e.g. compiz is an example); -#. * however it is not just the current workspace. -#: ../libwnck/wnckprop.c:243 -msgid "Make the window not have a fixed position in the viewport" -msgstr "" - -#. Translators: A pager is the technical term for the workspace -#. * switcher. It's a representation of all workspaces with windows -#. * inside it. Please make sure that the translation is in sync with -#. * gnome-panel, where this term is also used in translatable strings -#. -#: ../libwnck/wnckprop.c:250 -msgid "Make the window not appear in pagers" -msgstr "" - -#. Translators: A pager is the technical term for the workspace -#. * switcher. It's a representation of all workspaces with windows -#. * inside it. Please make sure that the translation is in sync with -#. * gnome-panel, where this term is also used in translatable strings -#. -#: ../libwnck/wnckprop.c:257 -msgid "Make the window appear in pagers" -msgstr "" - -#. Translators: "tasklist" is the list of running applications (the -#. * window list) -#: ../libwnck/wnckprop.c:261 -msgid "Make the window not appear in tasklists" -msgstr "" - -#. Translators: "tasklist" is the list of running applications (the -#. * window list) -#: ../libwnck/wnckprop.c:265 -msgid "Make the window appear in tasklists" -msgstr "" - -#: ../libwnck/wnckprop.c:267 -msgid "Make the window visible on all workspaces" -msgstr "" - -#: ../libwnck/wnckprop.c:269 -msgid "Make the window visible on the current workspace only" -msgstr "" - -#: ../libwnck/wnckprop.c:271 -msgid "Move the window to workspace NUMBER (first workspace is 0)" -msgstr "" - -#: ../libwnck/wnckprop.c:273 -msgid "Change the X coordinate of the window to X" -msgstr "" - -#: ../libwnck/wnckprop.c:275 -msgid "Change the Y coordinate of the window to Y" -msgstr "" - -#: ../libwnck/wnckprop.c:277 -msgid "Change the width of the window to WIDTH" -msgstr "" - -#: ../libwnck/wnckprop.c:277 -msgid "WIDTH" -msgstr "အနံ" - -#: ../libwnck/wnckprop.c:279 -msgid "Change the height of the window to HEIGHT" -msgstr "" - -#: ../libwnck/wnckprop.c:279 -msgid "HEIGHT" -msgstr "အမြင့်" - -#. Translators: do not translate "normal, desktop, dock..." -#: ../libwnck/wnckprop.c:282 -msgid "" -"Change the type of the window to TYPE (valid values: normal, desktop, dock, " -"dialog, toolbar, menu, utility, splash)" -msgstr "" - -#: ../libwnck/wnckprop.c:282 -msgid "TYPE" -msgstr "အမျိုးအစား" - -#: ../libwnck/wnckprop.c:288 -msgid "Change the name of the workspace to NAME" -msgstr "" - -#: ../libwnck/wnckprop.c:288 -msgid "NAME" -msgstr "အမည်" - -#: ../libwnck/wnckprop.c:290 -msgid "Activate the workspace" -msgstr "" - -#: ../libwnck/wnckprop.c:384 ../libwnck/wnckprop.c:408 -#: ../libwnck/wnckprop.c:444 ../libwnck/wnckprop.c:467 -#, c-format -msgid "Invalid value \"%s\" for --%s" -msgstr "" - -#: ../libwnck/wnckprop.c:501 ../libwnck/wnckprop.c:520 -#, c-format -msgid "" -"Conflicting options are present: screen %d should be interacted with, but --" -"%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:510 -#, c-format -msgid "" -"Conflicting options are present: windows or workspaces of screen %d should " -"be listed, but --%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:533 ../libwnck/wnckprop.c:553 -#, c-format -msgid "" -"Conflicting options are present: workspace %d should be interacted with, but " -"--%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:543 -#, c-format -msgid "" -"Conflicting options are present: windows of workspace %d should be listed, " -"but --%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:565 -#, c-format -msgid "" -"Conflicting options are present: an application should be interacted with, " -"but --%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:575 -#, c-format -msgid "" -"Conflicting options are present: windows of an application should be listed, " -"but --%s has been used\n" -msgstr "" - -#. Translators: A class is like a "family". E.g., all gvim windows -#. * are of the same class. -#: ../libwnck/wnckprop.c:589 -#, c-format -msgid "" -"Conflicting options are present: class group \"%s\" should be interacted " -"with, but --%s has been used\n" -msgstr "" - -#. Translators: A class is like a "family". E.g., all gvim windows -#. * are of the same class. -#: ../libwnck/wnckprop.c:601 -#, c-format -msgid "" -"Conflicting options are present: windows of class group \"%s\" should be " -"listed, but --%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:613 ../libwnck/wnckprop.c:622 -#, c-format -msgid "" -"Conflicting options are present: a window should be interacted with, but --" -"%s has been used\n" -msgstr "" - -#: ../libwnck/wnckprop.c:641 ../libwnck/wnckprop.c:722 -#: ../libwnck/wnckprop.c:769 -#, c-format -msgid "Conflicting options are present: --%s and --%s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:680 -#, c-format -msgid "" -"Invalid argument \"%d\" for --%s: the argument must be strictly positive\n" -msgstr "" - -#: ../libwnck/wnckprop.c:693 -#, c-format -msgid "Invalid argument \"%d\" for --%s: the argument must be positive\n" -msgstr "" - -#: ../libwnck/wnckprop.c:788 -#, c-format -msgid "Conflicting options are present: --%s or --%s, and --%s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:820 -#, c-format -msgid "Invalid argument \"%s\" for --%s, valid values are: %s\n" -msgstr "Invalid argument \"%s\" for --%s, valid values are: %s\n" - -#: ../libwnck/wnckprop.c:863 -#, c-format -msgid "" -"Cannot change the workspace layout on the screen: the layout is already " -"owned\n" -msgstr "" - -#. Translators: 'viewport' is kind of the viewable area. A viewport -#. * can be used to implement workspaces (e.g. compiz is an example); -#. * however it is not just the current workspace. -#: ../libwnck/wnckprop.c:898 -#, c-format -msgid "" -"Viewport cannot be moved: the current workspace does not contain a viewport\n" -msgstr "" - -#. Translators: 'viewport' is kind of the viewable area. A viewport -#. * can be used to implement workspaces (e.g. compiz is an example); -#. * however it is not just the current workspace. -#: ../libwnck/wnckprop.c:905 -#, c-format -msgid "Viewport cannot be moved: there is no current workspace\n" -msgstr "" - -#. FIXME: why do we have dual & boolean API. This is not consistent! -#: ../libwnck/wnckprop.c:941 ../libwnck/wnckprop.c:950 -#: ../libwnck/wnckprop.c:959 ../libwnck/wnckprop.c:966 -#: ../libwnck/wnckprop.c:976 ../libwnck/wnckprop.c:983 -#: ../libwnck/wnckprop.c:992 ../libwnck/wnckprop.c:1041 -#, c-format -msgid "Action not allowed\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1037 -#, c-format -msgid "" -"Window cannot be moved to workspace %d: the workspace does not exist\n" -msgstr "" - -#. Translators: 'unset' in the sense of "something has not been set". -#: ../libwnck/wnckprop.c:1101 ../libwnck/wnckprop.c:1233 -msgid "<name unset>" -msgstr "<name unset>" - -#. Translators: %lu is a window number and %s a window name -#: ../libwnck/wnckprop.c:1104 -#, c-format -msgid "%lu: %s\n" -msgstr "%lu: %s\n" - -#. Translators: %d is a workspace number and %s a workspace name -#: ../libwnck/wnckprop.c:1124 -#, c-format -msgid "%d: %s\n" -msgstr "%d: %s\n" - -#: ../libwnck/wnckprop.c:1187 -#, c-format -msgid "Screen Number: %d\n" -msgstr "Screen နံပါတ် - %d\n" - -#: ../libwnck/wnckprop.c:1189 ../libwnck/wnckprop.c:1270 -#, c-format -msgid "Geometry (width, height): %d, %d\n" -msgstr "ပထဝီ (အလျား, အမြင့်) - %d, %d\n" - -#: ../libwnck/wnckprop.c:1193 -#, c-format -msgid "Number of Workspaces: %d\n" -msgstr "အလုပ်လုပ်သည့်နေရာအရေအတွက် - %d\n" - -#: ../libwnck/wnckprop.c:1199 -#, c-format -msgid "Workspace Layout (rows, columns, orientation): %d, %d, %s\n" -msgstr "Workspace Layout (rows, columns, orientation): %d, %d, %s\n" - -#: ../libwnck/wnckprop.c:1209 ../libwnck/wnckprop.c:1266 -#: ../libwnck/wnckprop.c:1463 -msgid "<no EWMH-compliant window manager>" -msgstr "<no EWMH-compliant window manager>" - -#: ../libwnck/wnckprop.c:1210 -#, c-format -msgid "Window Manager: %s\n" -msgstr "Window Manager: %s\n" - -#. Translators: %d is a workspace number and %s a workspace name -#: ../libwnck/wnckprop.c:1215 ../libwnck/wnckprop.c:1296 -#: ../libwnck/wnckprop.c:1308 ../libwnck/wnckprop.c:1320 -#: ../libwnck/wnckprop.c:1332 ../libwnck/wnckprop.c:1448 -#, c-format -msgid "%d (\"%s\")" -msgstr "%d (\"%s\")" - -#. Translators: "none" here means "no workspace" -#: ../libwnck/wnckprop.c:1220 ../libwnck/wnckprop.c:1301 -#: ../libwnck/wnckprop.c:1313 ../libwnck/wnckprop.c:1325 -#: ../libwnck/wnckprop.c:1337 ../libwnck/wnckprop.c:1455 -msgctxt "workspace" -msgid "none" -msgstr "ဘာမှမဟုတ်" - -#: ../libwnck/wnckprop.c:1221 -#, c-format -msgid "Active Workspace: %s\n" -msgstr "Active Workspace: %s\n" - -#: ../libwnck/wnckprop.c:1230 -#, c-format -msgid "\"%s\"" -msgstr "\"%s\"" - -#. Translators: %lu is a window identifier (number) and %s a window name -#: ../libwnck/wnckprop.c:1236 -#, c-format -msgid "%lu (%s)" -msgstr "%lu (%s)" - -#. Translators: "none" here means "no window" -#: ../libwnck/wnckprop.c:1242 -msgctxt "window" -msgid "none" -msgstr "ဘာမှမဟုတ်" - -#: ../libwnck/wnckprop.c:1243 -#, c-format -msgid "Active Window: %s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1246 -#, c-format -msgid "Showing the desktop: %s\n" -msgstr "Desktop ကိုပြနေပါသည်။ - %s\n" - -#: ../libwnck/wnckprop.c:1248 -msgid "true" -msgstr "မှန်" - -#: ../libwnck/wnckprop.c:1248 -msgid "false" -msgstr "မှား" - -#: ../libwnck/wnckprop.c:1259 -#, c-format -msgid "Workspace Name: %s\n" -msgstr "အလုပ်လုပ်သည့်နေရာအမည်- %s\n" - -#: ../libwnck/wnckprop.c:1260 -#, c-format -msgid "Workspace Number: %d\n" -msgstr "အလုပ်လုပ်သည့်နေရာအရေအတွက် - %d\n" - -#: ../libwnck/wnckprop.c:1267 ../libwnck/wnckprop.c:1464 -#, c-format -msgid "On Screen: %d (Window Manager: %s)\n" -msgstr "On Screen: %d (Window Manager: %s)\n" - -#. Translators: 'viewport' is kind of the viewable area. A viewport can be -#. * used to implement workspaces (e.g. compiz is an example); however it is -#. * not just the current workspace. -#: ../libwnck/wnckprop.c:1282 -msgid "<no viewport>" -msgstr "<no viewport>" - -#. Translators: 'viewport' is kind of the viewable area. A viewport can be -#. * used to implement workspaces (e.g. compiz is an example); however it is -#. * not just the current workspace. -#: ../libwnck/wnckprop.c:1286 -#, c-format -msgid "Viewport position (x, y): %s\n" -msgstr "Viewport position (x, y): %s\n" - -#: ../libwnck/wnckprop.c:1289 -#, c-format -msgid "Position in Layout (row, column): %d, %d\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1302 -#, c-format -msgid "Left Neighbor: %s\n" -msgstr "ဘယ်ဖက် အိမ်နီးချင်း -%s\n" - -#: ../libwnck/wnckprop.c:1314 -#, c-format -msgid "Right Neighbor: %s\n" -msgstr "ညာဖက် အိမ်နီးချင်း - %s\n" - -#: ../libwnck/wnckprop.c:1326 -#, c-format -msgid "Top Neighbor: %s\n" -msgstr "အပေါ် အိမ်နီးချင်း - %s\n" - -#: ../libwnck/wnckprop.c:1338 -#, c-format -msgid "Bottom Neighbor: %s\n" -msgstr "အောက်အိမ်နီးချင်း - %s\n" - -#. Translators: Resource class is the name to identify a class. -#: ../libwnck/wnckprop.c:1352 -#, c-format -msgid "Resource Class: %s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1354 -#, c-format -msgid "Group Name: %s\n" -msgstr "အုပ်စုအမည်- %s\n" - -#. Translators: 'set' in the sense of "something has been set". -#: ../libwnck/wnckprop.c:1361 ../libwnck/wnckprop.c:1385 -#: ../libwnck/wnckprop.c:1439 -msgid "set" -msgstr "" - -#. Translators: 'unset' in the sense of "something has not been set". -#: ../libwnck/wnckprop.c:1364 ../libwnck/wnckprop.c:1388 -#: ../libwnck/wnckprop.c:1395 ../libwnck/wnckprop.c:1425 -#: ../libwnck/wnckprop.c:1432 ../libwnck/wnckprop.c:1442 -#: ../libwnck/wnckprop.c:1507 ../libwnck/wnckprop.c:1516 -#: ../libwnck/wnckprop.c:1528 ../libwnck/wnckprop.c:1536 -#: ../libwnck/wnckprop.c:1543 -msgid "<unset>" -msgstr "<unset>" - -#: ../libwnck/wnckprop.c:1365 ../libwnck/wnckprop.c:1389 -#: ../libwnck/wnckprop.c:1443 -#, c-format -msgid "Icons: %s\n" -msgstr "Icons: %s\n" - -#: ../libwnck/wnckprop.c:1368 ../libwnck/wnckprop.c:1406 -#, c-format -msgid "Number of Windows: %d\n" -msgstr "Windowsအရေအတွက် - %d\n" - -#: ../libwnck/wnckprop.c:1380 ../libwnck/wnckprop.c:1426 -#, c-format -msgid "Name: %s\n" -msgstr "အမည် - %s\n" - -#. Translators: note that "Icon" here has a specific window -#. * management-related meaning. It means minimized. -#: ../libwnck/wnckprop.c:1381 ../libwnck/wnckprop.c:1435 -#, c-format -msgid "Icon Name: %s\n" -msgstr "Icon အမည် - %s\n" - -#: ../libwnck/wnckprop.c:1396 ../libwnck/wnckprop.c:1529 -#, c-format -msgid "PID: %s\n" -msgstr "PID: %s\n" - -#. Translators: "none" here means "no startup ID" -#: ../libwnck/wnckprop.c:1403 -msgctxt "startupID" -msgid "none" -msgstr "ဘာမှမဟုတ်" - -#: ../libwnck/wnckprop.c:1404 -#, c-format -msgid "Startup ID: %s\n" -msgstr "Startup ID: %s\n" - -#: ../libwnck/wnckprop.c:1452 -msgid "all workspaces" -msgstr "အလုပ်လုပ်နေသည့်နေရာအားလုံး" - -#: ../libwnck/wnckprop.c:1456 -#, c-format -msgid "On Workspace: %s\n" -msgstr "On Workspace: %s\n" - -#: ../libwnck/wnckprop.c:1471 -msgid "normal window" -msgstr "ပုံမှန် window" - -#: ../libwnck/wnckprop.c:1474 -msgid "desktop" -msgstr "desktop" - -#: ../libwnck/wnckprop.c:1477 -msgid "dock or panel" -msgstr "" - -#: ../libwnck/wnckprop.c:1480 -msgid "dialog window" -msgstr "" - -#: ../libwnck/wnckprop.c:1483 -msgid "tearoff toolbar" -msgstr "" - -#: ../libwnck/wnckprop.c:1486 -msgid "tearoff menu" -msgstr "" - -#: ../libwnck/wnckprop.c:1489 -msgid "utility window" -msgstr "" - -#: ../libwnck/wnckprop.c:1492 -msgid "splash screen" -msgstr "" - -#: ../libwnck/wnckprop.c:1497 -#, c-format -msgid "Window Type: %s\n" -msgstr "Window အမျိုးအစား - %s\n" - -#: ../libwnck/wnckprop.c:1500 -#, c-format -msgid "Geometry (x, y, width, height): %d, %d, %d, %d\n" -msgstr "ပထဝီ (x, y, width, height): %d, %d, %d, %d\n" - -#. Translators: A class is like a "family". E.g., all gvim windows are of the -#. * same class. -#: ../libwnck/wnckprop.c:1509 -#, c-format -msgid "Class Group: %s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1522 -#, c-format -msgid "XID: %lu\n" -msgstr "XID: %lu\n" - -#: ../libwnck/wnckprop.c:1537 -#, c-format -msgid "Session ID: %s\n" -msgstr "" - -#. Translators: A group leader is the window that is the "owner" of a group -#. * of windows, ie: if you have multiple windows in one application, one -#. * window has some information about the application (like the application -#. * name). -#: ../libwnck/wnckprop.c:1551 -#, c-format -msgid "Group Leader: %lu\n" -msgstr "" - -#. Translators: A window can be transient for another window: it means it's -#. * on top of it -#: ../libwnck/wnckprop.c:1557 -#, c-format -msgid "Transient for: %lu\n" -msgstr "" - -#. FIXME: else print something? -#. Translators: we're building a list of items here. * For example, the result is "a, b". * In this case, the first string is "a", the second * string is ", " and the third string is "b". * We can then use this information here to also * recursively build longer lists, like "a, b, c, d" -#. Translators: we're building a list of items here. * The end result is something like "a, b, c" * In this case, the first string is "a, b", the second * string is ", " and the third string is "c" -#: ../libwnck/wnckprop.c:1572 ../libwnck/wnckprop.c:1620 -#, c-format -msgid "%1$s%2$s%3$s" -msgstr "" - -#. Translators: see comment for "%1$s%2$s%3$s" in order * to properly translate this -#: ../libwnck/wnckprop.c:1576 ../libwnck/wnckprop.c:1622 -msgid ", " -msgstr "" - -#: ../libwnck/wnckprop.c:1582 -msgid "minimized" -msgstr "" - -#: ../libwnck/wnckprop.c:1583 -msgid "maximized" -msgstr "" - -#: ../libwnck/wnckprop.c:1587 -msgid "maximized horizontally" -msgstr "" - -#: ../libwnck/wnckprop.c:1589 -msgid "maximized vertically" -msgstr "" - -#: ../libwnck/wnckprop.c:1591 -msgid "shaded" -msgstr "" - -#: ../libwnck/wnckprop.c:1592 -msgid "pinned" -msgstr "" - -#: ../libwnck/wnckprop.c:1593 -msgid "sticky" -msgstr "" - -#: ../libwnck/wnckprop.c:1594 -msgid "above" -msgstr "အထက်" - -#: ../libwnck/wnckprop.c:1595 -msgid "below" -msgstr "အောက်" - -#: ../libwnck/wnckprop.c:1596 -msgid "fullscreen" -msgstr "စခရင်မျက်နှာပြင်အပြည့်" - -#: ../libwnck/wnckprop.c:1597 -msgid "needs attention" -msgstr "" - -#. Translators: A pager is the technical term for the workspace switcher. -#. * It's a representation of all workspaces with windows inside it. -#. * Please make sure that the translation is in sync with gnome-panel, -#. * where this term is also used in translatable strings -#: ../libwnck/wnckprop.c:1602 -msgid "skip pager" -msgstr "" - -#. Translators: "tasklist" is the list of running applications (the window -#. * list) -#: ../libwnck/wnckprop.c:1605 -msgid "skip tasklist" -msgstr "" - -#: ../libwnck/wnckprop.c:1607 -msgid "normal" -msgstr "ပုံမှန်" - -#: ../libwnck/wnckprop.c:1608 -#, c-format -msgid "State: %s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1629 -msgid "move" -msgstr "ရွေ့" - -#: ../libwnck/wnckprop.c:1630 -msgid "resize" -msgstr "အရွယ်အစားပြုပြင်" - -#: ../libwnck/wnckprop.c:1631 -msgid "shade" -msgstr "အရိပ်" - -#: ../libwnck/wnckprop.c:1632 -msgid "unshade" -msgstr "" - -#: ../libwnck/wnckprop.c:1633 -msgid "stick" -msgstr "" - -#: ../libwnck/wnckprop.c:1634 -msgid "unstick" -msgstr "" - -#: ../libwnck/wnckprop.c:1636 -msgid "maximize horizontally" -msgstr "" - -#: ../libwnck/wnckprop.c:1638 -msgid "unmaximize horizontally" -msgstr "" - -#: ../libwnck/wnckprop.c:1640 -msgid "maximize vertically" -msgstr "" - -#: ../libwnck/wnckprop.c:1642 -msgid "unmaximize vertically" -msgstr "" - -#: ../libwnck/wnckprop.c:1645 -msgid "change workspace" -msgstr "အလုပ်နေရာပြောင်းမည်။" - -#: ../libwnck/wnckprop.c:1647 -msgid "pin" -msgstr "pin" - -#: ../libwnck/wnckprop.c:1649 -msgid "unpin" -msgstr "unpin" - -#: ../libwnck/wnckprop.c:1650 -msgid "minimize" -msgstr "ချုံ" - -#: ../libwnck/wnckprop.c:1651 -msgid "unminimize" -msgstr "" - -#: ../libwnck/wnckprop.c:1652 -msgid "maximize" -msgstr "ချဲ့" - -#: ../libwnck/wnckprop.c:1653 -msgid "unmaximize" -msgstr "" - -#: ../libwnck/wnckprop.c:1655 -msgid "change fullscreen mode" -msgstr "" - -#: ../libwnck/wnckprop.c:1656 -msgid "close" -msgstr "ပိတ်" - -#: ../libwnck/wnckprop.c:1658 -msgid "make above" -msgstr "" - -#: ../libwnck/wnckprop.c:1660 -msgid "unmake above" -msgstr "" - -#: ../libwnck/wnckprop.c:1662 -msgid "make below" -msgstr "" - -#: ../libwnck/wnckprop.c:1664 -msgid "unmake below" -msgstr "" - -#: ../libwnck/wnckprop.c:1666 -msgid "no action possible" -msgstr "" - -#: ../libwnck/wnckprop.c:1667 -#, c-format -msgid "Possible Actions: %s\n" -msgstr "Possible Actions: %s\n" - -#: ../libwnck/wnckprop.c:1899 -msgid "" -"Print or modify the properties of a screen/workspace/window, or interact " -"with it, following the EWMH specification.\n" -"For information about this specification, see:\n" -"\thttp://freedesktop.org/wiki/Specifications/wm-spec" -msgstr "" - -#: ../libwnck/wnckprop.c:1909 -msgid "Options to list windows or workspaces" -msgstr "" - -#: ../libwnck/wnckprop.c:1910 -msgid "Show options to list windows or workspaces" -msgstr "" - -#: ../libwnck/wnckprop.c:1917 -msgid "Options to modify properties of a window" -msgstr "" - -#: ../libwnck/wnckprop.c:1918 -msgid "Show options to modify properties of a window" -msgstr "" - -#: ../libwnck/wnckprop.c:1925 -msgid "Options to modify properties of a workspace" -msgstr "" - -#: ../libwnck/wnckprop.c:1926 -msgid "Show options to modify properties of a workspace" -msgstr "" - -#: ../libwnck/wnckprop.c:1933 -msgid "Options to modify properties of a screen" -msgstr "" - -#: ../libwnck/wnckprop.c:1934 -msgid "Show options to modify properties of a screen" -msgstr "" - -#: ../libwnck/wnckprop.c:1945 -#, c-format -msgid "Error while parsing arguments: %s\n" -msgstr "" - -#: ../libwnck/wnckprop.c:1968 -#, c-format -msgid "Cannot interact with screen %d: the screen does not exist\n" -msgstr "" - -#: ../libwnck/wnckprop.c:2024 -#, c-format -msgid "Cannot interact with workspace %d: the workspace cannot be found\n" -msgstr "" - -#. Translators: A class is like a "family". E.g., all gvim windows are -#. * of the same class. -#: ../libwnck/wnckprop.c:2048 -#, c-format -msgid "" -"Cannot interact with class group \"%s\": the class group cannot be found\n" -msgstr "" - -#: ../libwnck/wnckprop.c:2071 -#, c-format -msgid "" -"Cannot interact with application having its group leader with XID %lu: the " -"application cannot be found\n" -msgstr "" - -#: ../libwnck/wnckprop.c:2094 -#, c-format -msgid "" -"Cannot interact with window with XID %lu: the window cannot be found\n" -msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/lightdm.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/lightdm.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/lightdm.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/lightdm.po 2016-04-15 08:51:16.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: lightdm\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-15 03:53+0000\n" +"POT-Creation-Date: 2016-04-05 06:27+0000\n" "PO-Revision-Date: 2012-09-05 12:15+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:13+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:49+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../debian/config-error-dialog.sh:16 #, sh-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/Linux-PAM.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/Linux-PAM.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/Linux-PAM.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/Linux-PAM.po 2016-04-15 08:51:12.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:15+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:52+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/luksformat.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/luksformat.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/luksformat.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/luksformat.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:35+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:15+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../luksformat:33 msgid "This program needs to be started as root\n" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/mountall.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/mountall.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/mountall.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/mountall.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:01+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:39+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/mountall.c:785 msgid "unable to mount" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/nabi.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/nabi.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/nabi.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/nabi.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:22+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:01+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/candidate.c:367 msgid "hanja" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ndisc6.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ndisc6.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ndisc6.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ndisc6.po 2016-04-15 08:51:12.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 13:23+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:03+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: rdnssd/rdnssd.c:88 rdnssd/rdnssd.c:109 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/NetworkManager.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/NetworkManager.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/NetworkManager.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/NetworkManager.po 2016-04-15 08:51:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: network-manager\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-02-18 07:55+0000\n" +"POT-Creation-Date: 2016-04-12 08:54+0000\n" "PO-Revision-Date: 2012-05-10 09:29+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" @@ -15,10 +15,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:54+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:36+0000\n" +"X-Generator: Launchpad (build 17995)\n" -#: ../clients/cli/agent.c:42 +#: ../clients/cli/agent.c:39 #, c-format msgid "" "Usage: nmcli agent { COMMAND | help }\n" @@ -27,7 +27,7 @@ "\n" msgstr "" -#: ../clients/cli/agent.c:50 +#: ../clients/cli/agent.c:47 #, c-format msgid "" "Usage: nmcli agent secret { help }\n" @@ -39,7 +39,7 @@ "\n" msgstr "" -#: ../clients/cli/agent.c:60 +#: ../clients/cli/agent.c:57 #, c-format msgid "" "Usage: nmcli agent polkit { help }\n" @@ -51,7 +51,7 @@ "\n" msgstr "" -#: ../clients/cli/agent.c:70 +#: ../clients/cli/agent.c:67 #, c-format msgid "" "Usage: nmcli agent all { help }\n" @@ -60,452 +60,510 @@ "\n" msgstr "" -#: ../clients/cli/agent.c:152 +#: ../clients/cli/agent.c:149 #, c-format msgid "nmcli successfully registered as a NetworkManager's secret agent.\n" msgstr "" -#: ../clients/cli/agent.c:154 +#: ../clients/cli/agent.c:151 #, c-format msgid "Error: secret agent initialization failed" msgstr "" -#: ../clients/cli/agent.c:169 +#: ../clients/cli/agent.c:166 #, c-format msgid "Error: polkit agent initialization failed: %s" msgstr "" -#: ../clients/cli/agent.c:177 +#: ../clients/cli/agent.c:174 #, c-format msgid "nmcli successfully registered as a polkit agent.\n" msgstr "" -#: ../cli/src/connections.c:1308 ../cli/src/connections.c:2032 -#: ../cli/src/connections.c:2092 ../cli/src/connections.c:8072 -#: ../cli/src/connections.c:8280 ../cli/src/connections.c:8373 -#: ../cli/src/connections.c:8401 ../cli/src/devices.c:1202 -#: ../cli/src/devices.c:1250 ../cli/src/devices.c:1413 -#: ../cli/src/devices.c:1547 ../cli/src/devices.c:1684 -#: ../cli/src/devices.c:2140 ../cli/src/devices.c:2439 -#: ../cli/src/network-manager.c:484 +#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050 +#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343 +#: ../clients/cli/general.c:484 #, c-format msgid "Error: NetworkManager is not running." msgstr "အမှားအယွင်း - NetworkManager မဖွင့်ထားပါဘူး" -#: ../clients/cli/agent.c:245 +#: ../clients/cli/agent.c:242 #, c-format msgid "Error: 'agent' command '%s' is not valid." msgstr "" -#: ../cli/src/common.c:38 ../cli/src/common.c:50 ../cli/src/common.c:58 -#: ../cli/src/common.c:69 ../cli/src/connections.c:193 -#: ../cli/src/connections.c:215 +#: ../clients/cli/common.c:38 ../clients/cli/common.c:51 +#: ../clients/cli/common.c:59 ../clients/cli/common.c:71 +#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214 msgid "GROUP" msgstr "အုပ်စု" #. 0 -#: ../cli/src/common.c:39 ../cli/src/common.c:59 +#: ../clients/cli/common.c:39 ../clients/cli/common.c:60 msgid "ADDRESS" msgstr "လိပ်စာ" +#. 1 #. 2 -#: ../cli/src/connections.c:218 +#: ../clients/cli/common.c:40 ../clients/cli/common.c:61 +#: ../clients/cli/connections.c:217 msgid "GATEWAY" msgstr "GATEWAY" -#. 1 -#: ../cli/src/common.c:40 ../cli/src/common.c:60 +#. 2 +#: ../clients/cli/common.c:41 ../clients/cli/common.c:62 msgid "ROUTE" msgstr "လမ်းကြောင်း" -#. 2 -#: ../cli/src/common.c:41 ../cli/src/common.c:61 +#. 3 +#: ../clients/cli/common.c:42 ../clients/cli/common.c:63 msgid "DNS" msgstr "DNS" -#. 3 -#: ../cli/src/common.c:42 ../cli/src/common.c:62 +#. 4 +#: ../clients/cli/common.c:43 ../clients/cli/common.c:64 msgid "DOMAIN" msgstr "ဒိုမိန်း" -#. 4 -#: ../cli/src/common.c:43 +#. 5 +#: ../clients/cli/common.c:44 msgid "WINS" msgstr "WINS" #. 0 -#: ../cli/src/common.c:51 ../cli/src/common.c:70 +#: ../clients/cli/common.c:52 ../clients/cli/common.c:72 msgid "OPTION" msgstr "OPTION" -#: ../cli/src/common.c:559 +#: ../clients/cli/common.c:376 ../clients/cli/common.c:436 #, c-format msgid "invalid prefix '%s'; <1-%d> allowed" msgstr "" -#: ../clients/cli/common.c:386 +#: ../clients/cli/common.c:384 #, c-format msgid "invalid IP address: %s" msgstr "" -#: ../cli/src/common.c:574 +#: ../clients/cli/common.c:448 #, c-format msgid "" "the second component of route ('%s') is neither a next hop address nor a " "metric" msgstr "" -#: ../cli/src/common.c:584 +#: ../clients/cli/common.c:457 #, c-format msgid "invalid metric '%s'" msgstr "" -#: ../clients/cli/common.c:467 +#: ../clients/cli/common.c:465 #, c-format msgid "invalid route: %s" msgstr "" -#: ../cli/src/common.c:593 +#: ../clients/cli/common.c:477 msgid "default route cannot be added (NetworkManager handles it by itself)" msgstr "" -#: ../cli/src/common.c:681 +#: ../clients/cli/common.c:494 msgid "unmanaged" msgstr "" -#: ../cli/src/common.c:683 +#: ../clients/cli/common.c:496 msgid "unavailable" msgstr "မရရှိနိုင်" -#: ../cli/src/common.c:685 ../cli/src/network-manager.c:276 +#: ../clients/cli/common.c:498 ../clients/cli/general.c:245 msgid "disconnected" msgstr "အချိတ်အဆက်ပျက်" -#: ../cli/src/common.c:687 +#: ../clients/cli/common.c:500 msgid "connecting (prepare)" msgstr "ချိတ်ဆက်နေပါသည်။ (prepare)" -#: ../cli/src/common.c:689 +#: ../clients/cli/common.c:502 msgid "connecting (configuring)" msgstr "ချိတ်ဆက်နေပါသည်။(configuring)" -#: ../cli/src/common.c:691 +#: ../clients/cli/common.c:504 msgid "connecting (need authentication)" msgstr "ချိတ်ဆက်နေပါသည်။ (ခွင့်ပြုချက်လိုအပ်သည်။)" -#: ../cli/src/common.c:693 +#: ../clients/cli/common.c:506 msgid "connecting (getting IP configuration)" msgstr "ချိတ်ဆက်နေပါသည်။ (getting IP configuration)" -#: ../cli/src/common.c:695 +#: ../clients/cli/common.c:508 msgid "connecting (checking IP connectivity)" msgstr "ချိတ်ဆက်နေပါသည်။ (checking IP connectivity)" -#: ../cli/src/common.c:697 +#: ../clients/cli/common.c:510 msgid "connecting (starting secondary connections)" msgstr "ချိတ်ဆက်နေပါသည်။(starting secondary connections)" -#: ../cli/src/common.c:699 ../cli/src/network-manager.c:272 +#: ../clients/cli/common.c:512 ../clients/cli/general.c:241 msgid "connected" msgstr "ချိတ်ဆက်ပြီးပါပြီ။" -#: ../cli/src/common.c:701 ../cli/src/connections.c:560 +#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648 msgid "deactivating" msgstr "" -#: ../cli/src/common.c:703 +#: ../clients/cli/common.c:516 msgid "connection failed" msgstr "ချိတ်ဆက်မှုမအောင်မြင်ပါ။" -#: ../cli/src/common.c:705 ../cli/src/connections.c:565 -#: ../cli/src/connections.c:588 ../cli/src/connections.c:1656 -#: ../cli/src/devices.c:832 ../cli/src/devices.c:2282 -#: ../cli/src/network-manager.c:279 ../cli/src/network-manager.c:297 -#: ../cli/src/network-manager.c:360 ../cli/src/network-manager.c:363 -#: ../cli/src/network-manager.c:373 ../cli/src/network-manager.c:375 -#: ../cli/src/network-manager.c:432 ../cli/src/network-manager.c:448 -#: ../cli/src/settings.c:736 ../cli/src/settings.c:764 -#: ../cli/src/settings.c:826 ../cli/src/settings.c:1142 -#: ../cli/src/utils.c:1122 ../src/main.c:503 ../src/main.c:531 +#: ../clients/cli/common.c:518 ../clients/cli/common.c:535 +#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676 +#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024 +#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067 +#: ../clients/cli/general.c:248 ../clients/cli/general.c:286 +#: ../clients/cli/general.c:432 ../clients/cli/general.c:448 +#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925 +#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901 +#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400 +#, c-format msgid "unknown" msgstr "အမျိုးအမည်မသိ" -#: ../cli/src/common.c:714 +#. "CAPABILITIES" +#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933 +#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937 +#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040 +#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043 +#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563 +#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772 +#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990 +#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992 +#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028 +#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058 +#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060 +#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062 +#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064 +#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068 +#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200 +msgid "yes" +msgstr "ဟုတ်" + +#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933 +#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937 +#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041 +#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451 +#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564 +#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989 +#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991 +#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993 +#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030 +#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059 +#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061 +#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063 +#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066 +#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444 +#: ../clients/cli/settings.c:3202 +msgid "no" +msgstr "မဟုတ်" + +#: ../clients/cli/common.c:531 +msgid "yes (guessed)" +msgstr "" + +#: ../clients/cli/common.c:533 +msgid "no (guessed)" +msgstr "" + +#: ../clients/cli/common.c:544 msgid "No reason given" msgstr "" -#: ../cli/src/common.c:717 ../cli/src/connections.c:2452 +#. We should not really come here +#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976 #, c-format msgid "Unknown error" msgstr "အမည်မသိအမှား" -#: ../cli/src/common.c:720 +#: ../clients/cli/common.c:550 msgid "Device is now managed" msgstr "" -#: ../cli/src/common.c:723 +#: ../clients/cli/common.c:553 msgid "Device is now unmanaged" msgstr "" -#: ../cli/src/common.c:726 +#: ../clients/cli/common.c:556 msgid "The device could not be readied for configuration" msgstr "" -#: ../cli/src/common.c:729 +#: ../clients/cli/common.c:559 msgid "" "IP configuration could not be reserved (no available address, timeout, etc.)" msgstr "" -#: ../cli/src/common.c:732 +#: ../clients/cli/common.c:562 msgid "The IP configuration is no longer valid" msgstr "" -#: ../cli/src/common.c:735 +#: ../clients/cli/common.c:565 msgid "Secrets were required, but not provided" msgstr "" -#: ../cli/src/common.c:738 +#: ../clients/cli/common.c:568 msgid "802.1X supplicant disconnected" msgstr "" -#: ../cli/src/common.c:741 +#: ../clients/cli/common.c:571 msgid "802.1X supplicant configuration failed" msgstr "" -#: ../cli/src/common.c:744 +#: ../clients/cli/common.c:574 msgid "802.1X supplicant failed" msgstr "" -#: ../cli/src/common.c:747 +#: ../clients/cli/common.c:577 msgid "802.1X supplicant took too long to authenticate" msgstr "" -#: ../cli/src/common.c:750 +#: ../clients/cli/common.c:580 msgid "PPP service failed to start" msgstr "PPP service မစနိုင်ပါ။" -#: ../cli/src/common.c:753 +#: ../clients/cli/common.c:583 msgid "PPP service disconnected" msgstr "" -#: ../cli/src/common.c:756 +#: ../clients/cli/common.c:586 msgid "PPP failed" msgstr "PPP မအောင်မြင်ပါ။" -#: ../cli/src/common.c:759 +#: ../clients/cli/common.c:589 msgid "DHCP client failed to start" msgstr "DHCP client failed to start" -#: ../cli/src/common.c:762 +#: ../clients/cli/common.c:592 msgid "DHCP client error" msgstr "DHCP client error" -#: ../cli/src/common.c:765 +#: ../clients/cli/common.c:595 msgid "DHCP client failed" msgstr "DHCP client failed" -#: ../cli/src/common.c:768 +#: ../clients/cli/common.c:598 msgid "Shared connection service failed to start" msgstr "" -#: ../cli/src/common.c:771 +#: ../clients/cli/common.c:601 msgid "Shared connection service failed" msgstr "" -#: ../cli/src/common.c:774 +#: ../clients/cli/common.c:604 msgid "AutoIP service failed to start" msgstr "" -#: ../cli/src/common.c:777 +#: ../clients/cli/common.c:607 msgid "AutoIP service error" msgstr "AutoIP service error" -#: ../cli/src/common.c:780 +#: ../clients/cli/common.c:610 msgid "AutoIP service failed" msgstr "AutoIP service failed" -#: ../cli/src/common.c:783 +#: ../clients/cli/common.c:613 msgid "The line is busy" msgstr "The line is busy" -#: ../cli/src/common.c:786 +#: ../clients/cli/common.c:616 msgid "No dial tone" msgstr "" -#: ../cli/src/common.c:789 +#: ../clients/cli/common.c:619 msgid "No carrier could be established" msgstr "" -#: ../cli/src/common.c:792 +#: ../clients/cli/common.c:622 msgid "The dialing request timed out" msgstr "" -#: ../cli/src/common.c:795 +#: ../clients/cli/common.c:625 msgid "The dialing attempt failed" msgstr "" -#: ../cli/src/common.c:798 +#: ../clients/cli/common.c:628 msgid "Modem initialization failed" msgstr "" -#: ../cli/src/common.c:801 +#: ../clients/cli/common.c:631 msgid "Failed to select the specified APN" msgstr "" -#: ../cli/src/common.c:804 +#: ../clients/cli/common.c:634 msgid "Not searching for networks" msgstr "" -#: ../cli/src/common.c:807 +#: ../clients/cli/common.c:637 msgid "Network registration denied" msgstr "" -#: ../cli/src/common.c:810 +#: ../clients/cli/common.c:640 msgid "Network registration timed out" msgstr "" -#: ../cli/src/common.c:813 +#: ../clients/cli/common.c:643 msgid "Failed to register with the requested network" msgstr "" -#: ../cli/src/common.c:816 +#: ../clients/cli/common.c:646 msgid "PIN check failed" msgstr "PIN check failed" -#: ../cli/src/common.c:819 +#: ../clients/cli/common.c:649 msgid "Necessary firmware for the device may be missing" msgstr "ကိရိယာအတွက်လိုအပ်နေသော firmware ပျောက်နေပါသည်။" -#: ../cli/src/common.c:822 +#: ../clients/cli/common.c:652 msgid "The device was removed" msgstr "ဒီကိရိယာကိုဖြုတ်ပြီးသွားပါပြီ။" -#: ../cli/src/common.c:825 +#: ../clients/cli/common.c:655 msgid "NetworkManager went to sleep" msgstr "" -#: ../cli/src/common.c:828 +#: ../clients/cli/common.c:658 msgid "The device's active connection disappeared" msgstr "" -#: ../cli/src/common.c:831 +#: ../clients/cli/common.c:661 msgid "Device disconnected by user or client" msgstr "" -#: ../cli/src/common.c:834 +#: ../clients/cli/common.c:664 msgid "Carrier/link changed" msgstr "" -#: ../cli/src/common.c:837 +#: ../clients/cli/common.c:667 msgid "The device's existing connection was assumed" msgstr "" -#: ../cli/src/common.c:840 +#: ../clients/cli/common.c:670 msgid "The supplicant is now available" msgstr "" -#: ../cli/src/common.c:843 +#: ../clients/cli/common.c:673 msgid "The modem could not be found" msgstr "မိုဒမ်းကိုမတွေ့ပါ။" -#: ../cli/src/common.c:846 +#: ../clients/cli/common.c:676 msgid "The Bluetooth connection failed or timed out" msgstr "" -#: ../cli/src/common.c:849 +#: ../clients/cli/common.c:679 msgid "GSM Modem's SIM card not inserted" msgstr "" -#: ../cli/src/common.c:852 +#: ../clients/cli/common.c:682 msgid "GSM Modem's SIM PIN required" msgstr "GSM Modem's SIM PIN required" -#: ../cli/src/common.c:855 +#: ../clients/cli/common.c:685 msgid "GSM Modem's SIM PUK required" msgstr "GSM Modem's SIM PUK required" -#: ../cli/src/common.c:858 +#: ../clients/cli/common.c:688 msgid "GSM Modem's SIM wrong" msgstr "GSM Modem's SIM wrong" -#: ../cli/src/common.c:861 +#: ../clients/cli/common.c:691 msgid "InfiniBand device does not support connected mode" msgstr "InfiniBand device does not support connected mode" -#: ../cli/src/common.c:864 +#: ../clients/cli/common.c:694 msgid "A dependency of the connection failed" msgstr "A dependency of the connection failed" -#: ../cli/src/common.c:867 +#: ../clients/cli/common.c:697 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" msgstr "" -#: ../cli/src/common.c:870 +#: ../clients/cli/common.c:700 msgid "ModemManager is unavailable" msgstr "" -#: ../cli/src/common.c:873 +#: ../clients/cli/common.c:703 msgid "The Wi-Fi network could not be found" msgstr "" -#: ../cli/src/common.c:876 +#: ../clients/cli/common.c:706 msgid "A secondary connection of the base connection failed" msgstr "" -#: ../cli/src/common.c:879 +#: ../clients/cli/common.c:709 msgid "DCB or FCoE setup failed" msgstr "" -#: ../cli/src/common.c:882 +#: ../clients/cli/common.c:712 msgid "teamd control failed" msgstr "" -#: ../cli/src/common.c:885 +#: ../clients/cli/common.c:715 msgid "Modem failed or no longer available" msgstr "" -#: ../cli/src/common.c:888 +#: ../clients/cli/common.c:718 msgid "Modem now ready and available" msgstr "" -#: ../cli/src/common.c:891 +#: ../clients/cli/common.c:721 msgid "SIM PIN was incorrect" msgstr "" -#: ../clients/cli/common.c:709 +#: ../clients/cli/common.c:724 msgid "New connection activation was enqueued" msgstr "" -#: ../clients/cli/common.c:712 +#: ../clients/cli/common.c:727 msgid "The device's parent changed" msgstr "" -#: ../clients/cli/common.c:715 +#: ../clients/cli/common.c:730 msgid "The device parent's management changed" msgstr "" #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) -#: ../cli/src/common.c:895 ../cli/src/devices.c:639 -#: ../libnm-glib/nm-device.c:1837 +#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888 +#: ../libnm/nm-device.c:1839 msgid "Unknown" msgstr "အမည်မဲ့" -#: ../cli/src/common.c:937 +#: ../clients/cli/common.c:776 #, c-format msgid "invalid priority map '%s'" msgstr "" -#: ../cli/src/common.c:944 ../cli/src/common.c:950 +#: ../clients/cli/common.c:783 ../clients/cli/common.c:789 #, c-format msgid "priority '%s' is not valid (<0-%ld>)" msgstr "" -#: ../cli/src/common.c:1017 +#: ../clients/cli/common.c:856 #, c-format msgid "'%s' is not a valid team configuration or file name." msgstr "" -#: ../clients/cli/common.c:942 +#: ../clients/cli/common.c:958 +#, c-format +msgid "Error: openconnect failed: %s\n" +msgstr "" + +#: ../clients/cli/common.c:965 +#, c-format +msgid "Error: openconnect failed with status %d\n" +msgstr "" + +#: ../clients/cli/common.c:967 +#, c-format +msgid "Error: openconnect failed with signal %d\n" +msgstr "" + +#: ../clients/cli/common.c:1045 #, c-format msgid "" "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " @@ -513,59 +571,69 @@ msgstr "" #. define some prompts for connection editor -#: ../cli/src/connections.c:64 +#: ../clients/cli/connections.c:41 msgid "Setting name? " msgstr "" -#: ../cli/src/connections.c:65 +#: ../clients/cli/connections.c:42 msgid "Property name? " msgstr "" -#: ../cli/src/connections.c:66 +#: ../clients/cli/connections.c:43 msgid "Enter connection type: " msgstr "" #. define some other prompts -#: ../cli/src/connections.c:69 +#: ../clients/cli/connections.c:46 msgid "Connection type: " msgstr "" -#: ../cli/src/connections.c:70 +#: ../clients/cli/connections.c:47 msgid "VPN type: " msgstr "" -#: ../cli/src/connections.c:71 -msgid "Bond master: " +#: ../clients/cli/connections.c:48 +msgid "Master: " msgstr "" -#: ../cli/src/connections.c:72 -msgid "Team master: " +#: ../clients/cli/connections.c:49 +msgid "Connection (name, UUID, or path): " msgstr "" -#: ../cli/src/connections.c:73 -msgid "Bridge master: " +#: ../clients/cli/connections.c:50 +msgid "VPN connection (name, UUID, or path): " msgstr "" -#: ../cli/src/connections.c:74 -msgid "Connection (name, UUID, or path): " +#: ../clients/cli/connections.c:51 +msgid "Connection(s) (name, UUID, or path): " +msgstr "" + +#: ../clients/cli/connections.c:52 +msgid "Connection(s) (name, UUID, path or apath): " msgstr "" #: ../clients/cli/connections.c:53 -msgid "Connection(s) (name, UUID, or path): " +msgid "Tunnel mode: " +msgstr "" + +#: ../clients/cli/connections.c:54 +msgid "MACVLAN mode: " msgstr "" #. 0 -#: ../cli/src/connections.c:82 ../cli/src/connections.c:194 -#: ../cli/src/devices.c:89 ../cli/src/devices.c:117 ../cli/src/devices.c:127 -#: ../cli/src/devices.c:137 ../cli/src/devices.c:146 ../cli/src/devices.c:161 -#: ../cli/src/devices.c:174 ../cli/src/devices.c:200 ../cli/src/devices.c:215 -#: ../cli/src/devices.c:224 +#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193 +#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89 +#: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110 +#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137 +#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176 +#: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200 +#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251 msgid "NAME" msgstr "အမည်" #. 0 #. 1 -#: ../cli/src/connections.c:83 ../cli/src/connections.c:195 +#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194 msgid "UUID" msgstr "UUID" @@ -573,224 +641,235 @@ #. 0 #. 1 #. 2 -#: ../cli/src/connections.c:84 ../cli/src/connections.c:216 -#: ../cli/src/devices.c:75 ../cli/src/devices.c:91 ../cli/src/devices.c:203 +#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215 +#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57 +#: ../clients/cli/devices.c:179 msgid "TYPE" msgstr "အမျိုးအစား" #. 2 -#: ../cli/src/connections.c:85 +#: ../clients/cli/connections.c:76 msgid "TIMESTAMP" msgstr "TIMESTAMP" #. 3 -#: ../cli/src/connections.c:86 +#: ../clients/cli/connections.c:77 msgid "TIMESTAMP-REAL" msgstr "TIMESTAMP-REAL" #. 4 -#. 14 -#: ../cli/src/connections.c:87 ../cli/src/devices.c:104 +#. 16 +#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72 msgid "AUTOCONNECT" msgstr "အလိုအလျောက်ပြင်ဆင်ခြင်း" #. 5 -#: ../clients/cli/connections.c:67 +#: ../clients/cli/connections.c:79 msgid "AUTOCONNECT-PRIORITY" msgstr "" -#. 5 -#: ../cli/src/connections.c:88 +#. 6 +#: ../clients/cli/connections.c:80 msgid "READONLY" msgstr "" -#. 6 +#. 7 #. 8 #. 2 #. 15 #. 5 -#: ../cli/src/connections.c:89 ../cli/src/connections.c:202 -#: ../cli/src/devices.c:77 ../cli/src/devices.c:190 ../cli/src/devices.c:206 +#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201 +#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166 +#: ../clients/cli/devices.c:182 msgid "DBUS-PATH" msgstr "DBUS-PATH" -#. 7 +#. 8 #. 13 #. 4 -#: ../cli/src/connections.c:90 ../cli/src/devices.c:188 -#: ../cli/src/devices.c:205 +#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164 +#: ../clients/cli/devices.c:181 msgid "ACTIVE" msgstr "ကောင်းမွန်သော" -#. 8 +#. 9 #. 0 #. 12 #. 3 -#: ../cli/src/connections.c:91 ../cli/src/devices.c:74 ../cli/src/devices.c:90 -#: ../cli/src/devices.c:187 ../cli/src/devices.c:204 +#. 0 +#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40 +#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163 +#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252 msgid "DEVICE" msgstr "ကိရိယာ" -#. 9 +#. 10 #. 3 #. 1 -#. 9 +#. 10 #. 1 -#: ../cli/src/connections.c:92 ../cli/src/connections.c:197 -#: ../cli/src/devices.c:76 ../cli/src/devices.c:99 -#: ../cli/src/network-manager.c:39 +#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196 +#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66 +#: ../clients/cli/general.c:36 msgid "STATE" msgstr "" -#. 10 -#: ../cli/src/connections.c:93 +#. 11 +#: ../clients/cli/connections.c:85 msgid "ACTIVE-PATH" msgstr "" #. 2 -#: ../cli/src/connections.c:196 +#: ../clients/cli/connections.c:195 msgid "DEVICES" msgstr "ကိရိယာများ" #. 4 -#: ../cli/src/connections.c:198 +#: ../clients/cli/connections.c:197 msgid "DEFAULT" msgstr "မူလအတိုင်း" #. 5 -#: ../cli/src/connections.c:199 +#: ../clients/cli/connections.c:198 msgid "DEFAULT6" msgstr "DEFAULT6" #. 6 -#: ../cli/src/connections.c:200 +#: ../clients/cli/connections.c:199 msgid "SPEC-OBJECT" msgstr "SPEC-OBJECT" #. 7 #. 4 #. Ask for optional 'vpn' arguments. -#: ../cli/src/connections.c:201 ../cli/src/connections.c:239 -#: ../cli/src/connections.c:3505 ../tui/nm-editor-utils.c:243 -#: ../tui/nmt-connect-connection-list.c:407 +#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238 +#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233 +#: ../clients/tui/nmt-connect-connection-list.c:405 msgid "VPN" msgstr "VPN" #. 9 #. 5 -#. 18 -#: ../cli/src/connections.c:203 ../cli/src/devices.c:80 -#: ../cli/src/devices.c:108 +#. 22 +#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46 +#: ../clients/cli/devices.c:78 msgid "CON-PATH" msgstr "CON-PATH" #. 10 -#: ../cli/src/connections.c:204 +#: ../clients/cli/connections.c:203 msgid "ZONE" msgstr "ZONE" #. 11 -#: ../cli/src/connections.c:205 +#: ../clients/cli/connections.c:204 msgid "MASTER-PATH" msgstr "MASTER-PATH" #. 1 -#: ../cli/src/connections.c:217 +#: ../clients/cli/connections.c:216 msgid "USERNAME" msgstr "အသုံးပြုသူအမည်" #. 3 -#: ../cli/src/connections.c:219 +#: ../clients/cli/connections.c:218 msgid "BANNER" msgstr "BANNER" #. 4 -#: ../cli/src/connections.c:220 +#: ../clients/cli/connections.c:219 msgid "VPN-STATE" msgstr "VPN-STATE" #. 5 -#: ../cli/src/connections.c:221 +#: ../clients/cli/connections.c:220 msgid "CFG" msgstr "CFG" -#: ../cli/src/connections.c:234 ../cli/src/devices.c:239 +#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225 msgid "GENERAL" msgstr "ယေဘုယျ" #. 0 #. 6 -#: ../cli/src/connections.c:235 ../cli/src/devices.c:246 +#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232 msgid "IP4" msgstr "IP4" #. 1 #. 7 -#: ../cli/src/connections.c:236 ../cli/src/devices.c:247 +#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233 msgid "DHCP4" msgstr "DHCP4" #. 2 #. 8 -#: ../cli/src/connections.c:237 ../cli/src/devices.c:248 +#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234 msgid "IP6" msgstr "IP6" #. 3 #. 9 -#: ../cli/src/connections.c:238 ../cli/src/devices.c:249 +#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235 msgid "DHCP6" msgstr "DHCP6" -#: ../clients/cli/connections.c:253 +#: ../clients/cli/connections.c:272 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" "\n" -"COMMAND := { show | up | down | add | modify | edit | delete | reload | load " -"}\n" +"COMMAND := { show | up | down | add | modify | edit | delete | monitor | " +"reload | load }\n" "\n" -" show [--active] [[--show-secrets] [id | uuid | path | apath] <ID>] ...\n" -"\n" -" up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>] " -"[passwd-file <file with passwords>]\n" +" show [--active] [--order <order spec>]\n" +" show [--active] [id | uuid | path | apath] <ID> ...\n" "\n" " up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file " "<file with passwords>]\n" "\n" " down [id | uuid | path | apath] <ID> ...\n" "\n" -" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n" +" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-" +"]<setting>.<property> <value>)+]\n" "\n" " modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> " "<value>)+\n" "\n" +" clone [--temporary] [id | uuid | path ] <ID> <new name>\n" +"\n" " edit [id | uuid | path] <ID>\n" " edit [type <new_con_type>] [con-name <new_con_name>]\n" "\n" " delete [id | uuid | path] <ID>\n" "\n" +" monitor [id | uuid | path] <ID> ...\n" +"\n" " reload\n" "\n" " load <filename> [ <filename>... ]\n" "\n" +" import [--temporary] type <type> file <file to import>\n" +"\n" +" export [id | uuid | path] <ID> [<output file>]\n" +"\n" msgstr "" -#: ../clients/cli/connections.c:274 +#: ../clients/cli/connections.c:294 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" "\n" -"ARGUMENTS := [--active]\n" +"ARGUMENTS := [--active] [--order <order spec>]\n" "\n" "List in-memory and on-disk connection profiles, some of which may also be\n" "active if a device is using that connection profile. Without a parameter, " "all\n" "profiles are listed. When --active option is specified, only the active\n" -"profiles are shown.\n" +"profiles are shown. --order allows custom connection ordering (see manual " +"page).\n" "\n" -"ARGUMENTS := [--active] [--show-secrets] [id | uuid | path | apath] <ID> " -"...\n" +"ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n" "\n" "Show details for specified connections. By default, both static " "configuration\n" @@ -799,10 +878,11 @@ "using global '--fields' option. Refer to the manual page for more " "information.\n" "When --active option is specified, only the active profiles are taken into\n" -"account. --show-secrets option will reveal associated secrets as well.\n" +"account. Use global --show-secrets option to reveal associated secrets as " +"well.\n" msgstr "" -#: ../clients/cli/connections.c:295 +#: ../clients/cli/connections.c:315 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -827,7 +907,7 @@ "\n" msgstr "" -#: ../clients/cli/connections.c:316 +#: ../clients/cli/connections.c:336 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -841,20 +921,22 @@ "\n" msgstr "" -#: ../clients/cli/connections.c:328 +#: ../clients/cli/connections.c:348 #, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" "\n" -"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n" +"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-" +"- ([+|-]<setting>.<property> <value>)+]\n" "\n" " COMMON_OPTIONS:\n" " type <type>\n" " ifname <interface name> | \"*\"\n" " [con-name <connection name>]\n" " [autoconnect yes|no]\n" -"\n" " [save yes|no]\n" +" [master <master (ifname, or connection UUID or name)>]\n" +" [slave-type <master connection type>]\n" "\n" " TYPE_SPECIFIC_OPTIONS:\n" " ethernet: [mac <MAC address>]\n" @@ -892,7 +974,7 @@ " bluetooth: [addr <bluetooth address>]\n" " [bt-type panu|dun-gsm|dun-cdma]\n" "\n" -" vlan: dev <parent device (connection UUID, ifname, or MAC)>\n" +" vlan: dev <parent device (connection UUID, ifname, or MAC)>\n" " id <VLAN ID>\n" " [flags <VLAN flags>]\n" " [ingress <ingress priority mapping>]\n" @@ -924,6 +1006,7 @@ " [hello-time <1-10>]\n" " [max-age <6-40>]\n" " [ageing-time <0-1000000>]\n" +" [multicast-snooping yes|no]\n" " [mac <MAC address>]\n" "\n" " bridge-slave: master <master (ifname, or connection UUID or name)>\n" @@ -939,13 +1022,49 @@ " [channel <1-13>]\n" " [dhcp-anycast <MAC address>]\n" "\n" +" adsl: username <username>\n" +" protocol pppoa|pppoe|ipoatm\n" +" [password <password>]\n" +" [encapsulation vcmux|llc]\n" +"\n" +" tun: mode tun|tap\n" +" [owner <UID>]\n" +" [group <GID>]\n" +" [pi yes|no]\n" +" [vnet-hdr yes|no]\n" +" [multi-queue yes|no]\n" +"\n" +" ip-tunnel: mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n" +" remote <remote endpoint IP>\n" +" [local <local endpoint IP>]\n" +" [dev <parent device (ifname or connection UUID)>]\n" +"\n" +" macvlan: dev <parent device (connection UUID, ifname, or MAC)>\n" +" mode vepa|bridge|private|passthru|source\n" +" [tap yes|no]\n" +"\n" +" vxlan: id <VXLAN ID>\n" +" remote <IP of multicast group or remote address>\n" +" [local <source IP>]\n" +" [dev <parent device (ifname or connection UUID)>]\n" +" [source-port-min <0-65535>]\n" +" [source-port-max <0-65535>]\n" +" [destination-port <0-65535>]\n" +"\n" +" SLAVE_OPTIONS:\n" +" bridge: [priority <0-63>]\n" +" [path-cost <1-65535>]\n" +" [hairpin yes|no]\n" +"\n" +" team: [config <file>|<raw JSON data>]\n" +"\n" " IP_OPTIONS:\n" " [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n" " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n" "\n" msgstr "" -#: ../cli/src/connections.c:437 +#: ../clients/cli/connections.c:460 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -970,7 +1089,21 @@ "\n" msgstr "" -#: ../cli/src/connections.c:461 +#: ../clients/cli/connections.c:483 +#, c-format +msgid "" +"Usage: nmcli connection clone { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n" +"\n" +"Clone an existing connection profile. The newly created connection will be\n" +"the exact copy of the <ID>, except the uuid property (will be generated) " +"and\n" +"id (provided as <new name> argument).\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:495 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -986,7 +1119,7 @@ "\n" msgstr "" -#: ../cli/src/connections.c:477 +#: ../clients/cli/connections.c:510 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -998,7 +1131,20 @@ "\n" msgstr "" -#: ../cli/src/connections.c:489 +#: ../clients/cli/connections.c:521 +#, c-format +msgid "" +"Usage: nmcli connection monitor { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path] <ID> ...\n" +"\n" +"Monitor connection profile activity.\n" +"This command prints a line whenever the specified connection changes.\n" +"Monitors all connection profiles in case none is specified.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:533 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -1007,7 +1153,7 @@ "\n" msgstr "" -#: ../cli/src/connections.c:498 +#: ../clients/cli/connections.c:541 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -1021,983 +1167,1315 @@ "\n" msgstr "" -#: ../cli/src/connections.c:556 +#: ../clients/cli/connections.c:553 +#, c-format +msgid "" +"Usage: nmcli connection import { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [--temporary] type <type> file <file to import>\n" +"\n" +"Import an external/foreign configuration as a NetworkManager connection " +"profile.\n" +"The type of the input file is specified by type option.\n" +"Only VPN configurations are supported at the moment. The configuration\n" +"is imported by NetworkManager VPN plugins.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:566 +#, c-format +msgid "" +"Usage: nmcli connection export { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path] <ID> [<output file>]\n" +"\n" +"Export a connection. Only VPN connections are supported at the moment.\n" +"The data are directed to standard output or to a file if a name is given.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:644 msgid "activating" msgstr "" -#: ../cli/src/connections.c:558 +#: ../clients/cli/connections.c:646 msgid "activated" msgstr "" -#: ../cli/src/connections.c:562 +#: ../clients/cli/connections.c:650 msgid "deactivated" msgstr "" -#: ../cli/src/connections.c:574 +#: ../clients/cli/connections.c:662 msgid "VPN connecting (prepare)" msgstr "VPN connecting (prepare)" -#: ../cli/src/connections.c:576 +#: ../clients/cli/connections.c:664 msgid "VPN connecting (need authentication)" msgstr "VPN connecting (ခွင့်ပြုချက်လိုအပ်ပါသည်။)" -#: ../cli/src/connections.c:578 +#: ../clients/cli/connections.c:666 msgid "VPN connecting" msgstr "VPN ချိတ်ဆက်နေပါသည်။" -#: ../cli/src/connections.c:580 +#: ../clients/cli/connections.c:668 msgid "VPN connecting (getting IP configuration)" msgstr "" -#: ../cli/src/connections.c:582 +#: ../clients/cli/connections.c:670 msgid "VPN connected" msgstr "VPN ချိတ်ဆက်ပြီးသွားပါပြီ။" -#: ../cli/src/connections.c:584 +#: ../clients/cli/connections.c:672 msgid "VPN connection failed" msgstr "VPN ချိတ်ဆက်မှုမအောင်မြင်ပါ။" -#: ../cli/src/connections.c:586 +#: ../clients/cli/connections.c:674 msgid "VPN disconnected" msgstr "VPN အချိတ်အဆက်ပျက်သွားပါပြီ။" -#: ../clients/cli/connections.c:636 +#: ../clients/cli/connections.c:744 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "" -#: ../cli/src/connections.c:669 +#: ../clients/cli/connections.c:764 msgid "Connection profile details" msgstr "" -#: ../cli/src/connections.c:681 ../cli/src/connections.c:1033 +#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169 #, c-format msgid "Error: 'connection show': %s" msgstr "" -#: ../cli/src/connections.c:825 +#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897 msgid "never" msgstr "ဘယ်တော့မှ" -#. "CAPABILITIES" -#: ../cli/src/connections.c:826 ../cli/src/connections.c:827 -#: ../cli/src/connections.c:829 ../cli/src/connections.c:888 -#: ../cli/src/connections.c:889 ../cli/src/connections.c:891 -#: ../cli/src/connections.c:2841 ../cli/src/connections.c:6572 -#: ../cli/src/connections.c:6573 ../cli/src/devices.c:609 -#: ../cli/src/devices.c:659 ../cli/src/devices.c:801 ../cli/src/devices.c:802 -#: ../cli/src/devices.c:803 ../cli/src/devices.c:836 ../cli/src/devices.c:865 -#: ../cli/src/devices.c:866 ../cli/src/devices.c:867 ../cli/src/devices.c:868 -#: ../cli/src/devices.c:869 ../cli/src/devices.c:870 ../cli/src/devices.c:871 -#: ../cli/src/network-manager.c:442 ../cli/src/settings.c:1509 -msgid "yes" -msgstr "ဟုတ်" - -#: ../cli/src/connections.c:826 ../cli/src/connections.c:827 -#: ../cli/src/connections.c:829 ../cli/src/connections.c:888 -#: ../cli/src/connections.c:889 ../cli/src/connections.c:891 -#: ../cli/src/connections.c:2842 ../cli/src/connections.c:6572 -#: ../cli/src/connections.c:6573 ../cli/src/devices.c:609 -#: ../cli/src/devices.c:659 ../cli/src/devices.c:801 ../cli/src/devices.c:802 -#: ../cli/src/devices.c:803 ../cli/src/devices.c:836 ../cli/src/devices.c:865 -#: ../cli/src/devices.c:866 ../cli/src/devices.c:867 ../cli/src/devices.c:868 -#: ../cli/src/devices.c:869 ../cli/src/devices.c:870 ../cli/src/devices.c:871 -#: ../cli/src/network-manager.c:444 ../cli/src/settings.c:1509 -msgid "no" -msgstr "မဟုတ်" - -#: ../cli/src/connections.c:1021 +#: ../clients/cli/connections.c:1157 msgid "Activate connection details" msgstr "" -#: ../cli/src/connections.c:1254 +#: ../clients/cli/connections.c:1393 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "" -#: ../cli/src/connections.c:1269 ../cli/src/connections.c:1277 +#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416 #, c-format msgid "'%s' has to be alone" msgstr "" #. Add headers -#: ../cli/src/connections.c:1338 +#: ../clients/cli/connections.c:1634 msgid "NetworkManager active profiles" msgstr "" -#: ../cli/src/connections.c:1339 +#: ../clients/cli/connections.c:1635 msgid "NetworkManager connection profiles" msgstr "" -#: ../cli/src/connections.c:1376 ../cli/src/connections.c:1977 -#: ../cli/src/connections.c:1993 ../cli/src/connections.c:2002 -#: ../cli/src/connections.c:2012 ../cli/src/connections.c:2109 -#: ../cli/src/connections.c:8088 ../cli/src/connections.c:8311 -#: ../cli/src/devices.c:1642 ../cli/src/devices.c:1650 -#: ../cli/src/devices.c:2053 ../cli/src/devices.c:2060 -#: ../cli/src/devices.c:2074 ../cli/src/devices.c:2081 -#: ../cli/src/devices.c:2098 ../cli/src/devices.c:2106 -#: ../cli/src/devices.c:2302 ../cli/src/devices.c:2398 -#: ../cli/src/devices.c:2405 +#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389 +#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420 +#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588 +#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273 +#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538 +#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659 +#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344 +#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675 +#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696 +#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720 +#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741 +#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112 +#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131 +#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151 +#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330 +#: ../clients/cli/devices.c:3503 #, c-format msgid "Error: %s argument is missing." msgstr "" -#: ../cli/src/connections.c:1427 +#: ../clients/cli/connections.c:1696 #, c-format msgid "Error: %s - no such connection profile." msgstr "" -#: ../cli/src/connections.c:1443 ../cli/src/connections.c:2045 -#: ../cli/src/connections.c:8379 ../cli/src/connections.c:8420 -#: ../cli/src/connections.c:8625 ../cli/src/devices.c:2281 -#: ../cli/src/devices.c:2737 ../cli/src/network-manager.c:539 -#: ../cli/src/network-manager.c:582 ../cli/src/network-manager.c:599 -#: ../cli/src/network-manager.c:645 ../cli/src/network-manager.c:659 -#: ../cli/src/network-manager.c:776 ../cli/src/network-manager.c:820 -#: ../cli/src/network-manager.c:840 +#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452 +#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292 +#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539 +#: ../clients/cli/general.c:588 ../clients/cli/general.c:605 +#: ../clients/cli/general.c:644 ../clients/cli/general.c:658 +#: ../clients/cli/general.c:776 ../clients/cli/general.c:823 +#: ../clients/cli/general.c:843 #, c-format msgid "Error: %s." msgstr "အမှားအယွင်း -%s." -#: ../cli/src/connections.c:1538 +#: ../clients/cli/connections.c:1851 #, c-format msgid "no active connection on device '%s'" msgstr "'%s' မှာကောင်းမွန်တဲ့ကွန်နက်ရှင်လိုင်းမရှိပါ။" -#: ../cli/src/connections.c:1546 +#: ../clients/cli/connections.c:1859 msgid "no active connection or device" msgstr "" -#: ../cli/src/connections.c:1617 +#: ../clients/cli/connections.c:1910 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "" -#: ../cli/src/connections.c:1620 +#: ../clients/cli/connections.c:1913 #, c-format msgid "no device found for connection '%s'" msgstr "'%s'ကွန်နက်ရှင်အတွက်ကိရိယာရှာမတွေ့ပါ" -#: ../cli/src/connections.c:1632 +#: ../clients/cli/connections.c:1925 msgid "unknown reason" msgstr "အကြောင်းပြချက်မသိ" -#: ../cli/src/connections.c:1634 ../cli/src/network-manager.c:288 +#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277 msgid "none" msgstr "ဘာမှမဟုတ်" -#: ../cli/src/connections.c:1636 +#: ../clients/cli/connections.c:1929 msgid "the user was disconnected" msgstr "အသုံးပြုသူသည်လိုင်းချိတ်ဆက်မှုမှပျက်သွားပါပြီ။" -#: ../cli/src/connections.c:1638 +#: ../clients/cli/connections.c:1931 msgid "the base network connection was interrupted" msgstr "the base network connection was interrupted" -#: ../cli/src/connections.c:1640 +#: ../clients/cli/connections.c:1933 msgid "the VPN service stopped unexpectedly" msgstr "မမျှော်လင့်ပဲ VPN service သည်ရုတ်တရက်ရပ်သွားပါသည်။" -#: ../cli/src/connections.c:1642 +#: ../clients/cli/connections.c:1935 msgid "the VPN service returned invalid configuration" msgstr "" -#: ../cli/src/connections.c:1644 +#: ../clients/cli/connections.c:1937 msgid "the connection attempt timed out" msgstr "လိုင်းချိတ်ဆက်မှု ကြိုးစားခြင်းအချိန်ပြည့်သွားပါပြီ။" -#: ../cli/src/connections.c:1646 +#: ../clients/cli/connections.c:1939 msgid "the VPN service did not start in time" msgstr "" -#: ../cli/src/connections.c:1648 +#: ../clients/cli/connections.c:1941 msgid "the VPN service failed to start" msgstr "" -#: ../cli/src/connections.c:1650 +#: ../clients/cli/connections.c:1943 msgid "no valid VPN secrets" msgstr "no valid VPN secrets" -#: ../cli/src/connections.c:1652 +#: ../clients/cli/connections.c:1945 msgid "invalid VPN secrets" msgstr "invalid VPN secrets" -#: ../cli/src/connections.c:1654 +#: ../clients/cli/connections.c:1947 msgid "the connection was removed" msgstr "ကွန်နက်ရှင်လိုင်းကိုဖြုတ်လိုက်ပါသည်။" -#: ../cli/src/connections.c:1671 ../cli/src/connections.c:1827 -#: ../cli/src/connections.c:6468 +#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997 +#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "" -#: ../clients/cli/connections.c:1735 +#: ../clients/cli/connections.c:1976 #, c-format msgid "" "Connection successfully activated (master waiting for slaves) (D-Bus active " "path: %s)\n" msgstr "" -#: ../cli/src/connections.c:1676 +#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002 #, c-format msgid "Error: Connection activation failed." msgstr "" -#: ../cli/src/connections.c:1701 +#: ../clients/cli/connections.c:2053 #, c-format msgid "VPN connection successfully activated (D-Bus active path: %s)\n" msgstr "" -#: ../cli/src/connections.c:1708 +#: ../clients/cli/connections.c:2061 #, c-format msgid "Error: Connection activation failed: %s." msgstr "" -#: ../cli/src/connections.c:1726 ../cli/src/devices.c:1299 +#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426 #, c-format msgid "Error: Timeout %d sec expired." msgstr "" -#: ../cli/src/connections.c:1811 +#: ../clients/cli/connections.c:2140 #, c-format msgid "Error: Connection activation failed: %s" msgstr "" -#: ../clients/cli/connections.c:1984 +#: ../clients/cli/connections.c:2225 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "" -#: ../clients/cli/connections.c:1996 +#: ../clients/cli/connections.c:2237 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2004 +#: ../clients/cli/connections.c:2245 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2017 +#: ../clients/cli/connections.c:2258 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "" -#: ../cli/src/connections.c:1916 ../cli/src/connections.c:2046 -msgid "unknown error" -msgstr "" - -#: ../cli/src/connections.c:1924 +#: ../clients/cli/connections.c:2314 #, c-format msgid "unknown device '%s'." msgstr "" -#: ../cli/src/connections.c:1929 +#: ../clients/cli/connections.c:2319 msgid "neither a valid connection nor device given" msgstr "" -#: ../clients/cli/connections.c:2161 +#: ../clients/cli/connections.c:2402 #, c-format msgid "Error: Connection '%s' does not exist." msgstr "" -#: ../cli/src/connections.c:2021 ../cli/src/devices.c:1176 -#: ../cli/src/devices.c:1656 ../cli/src/devices.c:2117 -#: ../cli/src/devices.c:2411 +#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325 +#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752 +#: ../clients/cli/devices.c:3336 #, c-format msgid "Unknown parameter: %s\n" msgstr "Unknown parameter: %s\n" -#: ../cli/src/connections.c:2054 +#: ../clients/cli/connections.c:2462 msgid "preparing" msgstr "" -#: ../clients/cli/connections.c:2255 +#: ../clients/cli/connections.c:2483 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "" -#: ../clients/cli/connections.c:2271 +#: ../clients/cli/connections.c:2499 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "" -#: ../cli/src/connections.c:2082 ../cli/src/connections.c:8292 -#: ../cli/src/connections.c:8407 +#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391 +#: ../clients/cli/connections.c:10590 #, c-format msgid "Error: No connection specified." msgstr "" -#: ../clients/cli/connections.c:2375 +#: ../clients/cli/connections.c:2602 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "" -#: ../clients/cli/connections.c:2376 ../clients/cli/connections.c:8872 +#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420 #, c-format msgid "Error: not all active connections found." msgstr "" -#: ../clients/cli/connections.c:2385 +#: ../clients/cli/connections.c:2612 #, c-format msgid "Error: no active connection provided." msgstr "" -#: ../cli/src/connections.c:2431 ../cli/src/utils.c:515 +#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702 #, c-format msgid "'%s' not among [%s]" msgstr "" -#: ../cli/src/connections.c:2513 +#: ../clients/cli/connections.c:3032 #, c-format msgid "Error: '%s': '%s' is not a valid %s MAC address." msgstr "" #. Ask for optional arguments -#: ../cli/src/connections.c:2514 ../cli/src/connections.c:2957 -#: ../libnm-glib/nm-device.c:1825 ../tui/nm-editor-utils.c:173 +#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565 +#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716 +#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812 msgid "InfiniBand" msgstr "" -#: ../cli/src/connections.c:2514 ../libnm-glib/nm-device.c:1813 -#: ../tui/nm-editor-utils.c:156 +#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146 +#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800 msgid "Ethernet" msgstr "" -#: ../cli/src/connections.c:2537 +#: ../clients/cli/connections.c:3053 #, c-format msgid "Error: 'mtu': '%s' is not a valid MTU." msgstr "" -#: ../cli/src/connections.c:2553 +#: ../clients/cli/connections.c:3069 #, c-format msgid "Error: 'parent': '%s' is not a valid interface name." msgstr "" -#: ../cli/src/connections.c:2574 +#: ../clients/cli/connections.c:3090 #, c-format msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY." msgstr "" -#: ../clients/cli/connections.c:2882 +#: ../clients/cli/connections.c:3105 +#, c-format +msgid "Error: '%s' is not a valid UID/GID." +msgstr "" + +#: ../clients/cli/connections.c:3149 #, c-format msgid "Error: '%s': '%s' is not a valid %s %s." msgstr "" -#: ../clients/cli/connections.c:2895 +#: ../clients/cli/connections.c:3162 msgid "Wi-Fi mode" msgstr "" -#: ../clients/cli/connections.c:2904 +#: ../clients/cli/connections.c:3171 msgid "InfiniBand transport mode" msgstr "" -#: ../cli/src/connections.c:2617 +#: ../clients/cli/connections.c:3183 +msgid "ADSL protocol" +msgstr "" + +#: ../clients/cli/connections.c:3194 +msgid "ADSL encapsulation" +msgstr "" + +#: ../clients/cli/connections.c:3203 +msgid "TUN device mode" +msgstr "" + +#: ../clients/cli/connections.c:3216 #, c-format msgid "Error: 'flags': '%s' is not valid; use <0-7>." msgstr "" -#: ../cli/src/connections.c:2639 +#: ../clients/cli/connections.c:3238 #, c-format msgid "Error: '%s': '%s' is not valid; %s " msgstr "" -#: ../cli/src/connections.c:2832 +#: ../clients/cli/connections.c:3416 +#, c-format +msgid "Warning: master='%s' doesn't refer to any existing profile.\n" +msgstr "" + +#: ../clients/cli/connections.c:3441 #, c-format msgid "Error: '%s': '%s' is not valid; use <%u-%u>." msgstr "" #. Ask for optional arguments. -#: ../cli/src/connections.c:2888 +#: ../clients/cli/connections.c:3497 #, c-format msgid "There is %d optional argument for '%s' connection type.\n" msgid_plural "There are %d optional arguments for '%s' connection type.\n" msgstr[0] "" msgstr[1] "" -#: ../cli/src/connections.c:2891 +#: ../clients/cli/connections.c:3500 #, c-format msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" msgstr[0] "" msgstr[1] "" -#: ../cli/src/connections.c:2906 +#. Ask for optional arguments +#: ../clients/cli/connections.c:3517 msgid "ethernet" msgstr "" -#: ../cli/src/connections.c:2914 ../cli/src/connections.c:2962 -#: ../cli/src/connections.c:3071 ../cli/src/connections.c:3150 +#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570 +#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783 msgid "MTU [auto]: " msgstr "" -#: ../cli/src/connections.c:2925 ../cli/src/connections.c:2973 -#: ../cli/src/connections.c:3043 ../cli/src/connections.c:3082 -#: ../cli/src/connections.c:3437 +#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581 +#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715 +#: ../clients/cli/connections.c:4101 msgid "MAC [none]: " msgstr "" -#: ../cli/src/connections.c:2936 +#: ../clients/cli/connections.c:3544 msgid "Cloned MAC [none]: " msgstr "" -#: ../cli/src/connections.c:2984 +#: ../clients/cli/connections.c:3592 #, c-format msgid "Transport mode %s" msgstr "" -#: ../cli/src/connections.c:2997 +#: ../clients/cli/connections.c:3605 msgid "Parent interface [none]: " msgstr "" -#: ../cli/src/connections.c:3008 +#: ../clients/cli/connections.c:3616 msgid "P_KEY [none]: " msgstr "" -#: ../cli/src/connections.c:3018 +#: ../clients/cli/connections.c:3626 #, c-format msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n" msgstr "" -#: ../cli/src/connections.c:2906 ../libnm-glib/nm-device.c:1815 -#: ../tui/nm-editor-utils.c:164 +#. Ask for optional arguments +#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154 +#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802 msgid "Wi-Fi" msgstr "" -#: ../clients/cli/connections.c:3328 +#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199 #, c-format msgid "Mode %s" msgstr "" #. Ask for optional 'wimax' arguments. -#: ../cli/src/connections.c:3038 ../libnm-glib/nm-device.c:1821 +#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857 +#: ../libnm/nm-device.c:1808 msgid "WiMAX" msgstr "" #. Ask for optional 'pppoe' arguments. -#: ../cli/src/connections.c:3061 +#: ../clients/cli/connections.c:3694 msgid "PPPoE" msgstr "" -#: ../cli/src/connections.c:3065 ../cli/src/connections.c:3103 +#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736 +#: ../clients/cli/connections.c:4223 msgid "Password [none]: " msgstr "" -#: ../cli/src/connections.c:3067 +#: ../clients/cli/connections.c:3700 msgid "Service [none]: " msgstr "" #. Ask for optional 'gsm' or 'cdma' arguments. -#: ../cli/src/connections.c:3097 +#: ../clients/cli/connections.c:3730 msgid "mobile broadband" msgstr "" -#: ../cli/src/connections.c:3101 ../cli/src/connections.c:3509 +#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173 msgid "Username [none]: " msgstr "" #. Ask for optional 'bluetooth' arguments. -#: ../cli/src/connections.c:3116 +#: ../clients/cli/connections.c:3749 msgid "bluetooth" msgstr "" -#: ../cli/src/connections.c:3123 +#: ../clients/cli/connections.c:3756 #, c-format msgid "Bluetooth type %s" msgstr "" -#: ../cli/src/connections.c:3129 +#: ../clients/cli/connections.c:3762 #, c-format msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n" msgstr "" #. Ask for optional 'vlan' arguments. -#. 11 -#: ../cli/src/connections.c:3145 ../cli/src/devices.c:251 -#: ../libnm-glib/nm-device.c:1833 ../libnm-util/nm-connection.c:1303 -#: ../tui/nm-editor-utils.c:227 ../tui/nmt-page-vlan.c:53 +#. 13 +#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239 +#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94 +#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869 +#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820 msgid "VLAN" msgstr "" -#: ../cli/src/connections.c:3161 +#: ../clients/cli/connections.c:3794 msgid "VLAN flags (<0-7>) [none]: " msgstr "" -#: ../cli/src/connections.c:3172 +#: ../clients/cli/connections.c:3805 msgid "Ingress priority maps [none]: " msgstr "" -#: ../cli/src/connections.c:3183 +#: ../clients/cli/connections.c:3816 msgid "Egress priority maps [none]: " msgstr "" -#: ../cli/src/connections.c:3194 +#: ../clients/cli/connections.c:3827 msgid "Bonding mode [balance-rr]: " msgstr "" #. Ask for optional 'bond' arguments. -#: ../cli/src/connections.c:3209 +#: ../clients/cli/connections.c:3843 msgid "bond" msgstr "" -#: ../cli/src/connections.c:3231 +#: ../clients/cli/connections.c:3865 msgid "Bonding primary interface [none]: " msgstr "" -#: ../cli/src/connections.c:3234 +#: ../clients/cli/connections.c:3868 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name.\n" msgstr "" -#: ../cli/src/connections.c:3242 +#: ../clients/cli/connections.c:3876 #, c-format msgid "Bonding monitoring mode %s" msgstr "" -#: ../cli/src/connections.c:3248 +#: ../clients/cli/connections.c:3882 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "" -#: ../cli/src/connections.c:3257 +#: ../clients/cli/connections.c:3891 msgid "Bonding miimon [100]: " msgstr "" -#: ../cli/src/connections.c:3260 +#: ../clients/cli/connections.c:3894 #, c-format msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n" msgstr "" -#: ../cli/src/connections.c:3268 +#: ../clients/cli/connections.c:3902 msgid "Bonding downdelay [0]: " msgstr "" -#: ../cli/src/connections.c:3271 +#: ../clients/cli/connections.c:3905 #, c-format msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n" msgstr "" -#: ../cli/src/connections.c:3279 +#: ../clients/cli/connections.c:3913 msgid "Bonding updelay [0]: " msgstr "" -#: ../cli/src/connections.c:3282 +#: ../clients/cli/connections.c:3916 #, c-format msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n" msgstr "" -#: ../cli/src/connections.c:3291 +#: ../clients/cli/connections.c:3925 msgid "Bonding arp-interval [0]: " msgstr "" -#: ../cli/src/connections.c:3294 +#: ../clients/cli/connections.c:3928 #, c-format msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n" msgstr "" #. FIXME: verify the string -#: ../cli/src/connections.c:3302 +#: ../clients/cli/connections.c:3936 msgid "Bonding arp-ip-target [none]: " msgstr "" -#: ../clients/cli/connections.c:3620 +#: ../clients/cli/connections.c:3943 msgid "LACP rate ('slow' or 'fast') [slow]: " msgstr "" -#: ../clients/cli/connections.c:3626 +#: ../clients/cli/connections.c:3949 #, c-format msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n" msgstr "" -#: ../cli/src/connections.c:3322 +#: ../clients/cli/connections.c:3972 msgid "Team JSON configuration [none]: " msgstr "" -#: ../cli/src/connections.c:3339 +#: ../clients/cli/connections.c:3989 msgid "team" msgstr "" -#: ../cli/src/connections.c:3345 +#: ../clients/cli/connections.c:3995 msgid "team-slave" msgstr "" #. Ask for optional 'bridge' arguments. -#: ../cli/src/connections.c:3357 +#: ../clients/cli/connections.c:4007 msgid "bridge" msgstr "" -#: ../cli/src/connections.c:3363 +#: ../clients/cli/connections.c:4013 #, c-format msgid "Enable STP %s" msgstr "" -#: ../cli/src/connections.c:3368 +#: ../clients/cli/connections.c:4018 #, c-format msgid "Error: 'stp': %s.\n" msgstr "" -#: ../cli/src/connections.c:3376 +#: ../clients/cli/connections.c:4026 msgid "STP priority [32768]: " msgstr "" -#: ../cli/src/connections.c:3380 +#: ../clients/cli/connections.c:4030 #, c-format msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n" msgstr "" -#: ../cli/src/connections.c:3388 +#: ../clients/cli/connections.c:4038 msgid "Forward delay [15]: " msgstr "" -#: ../cli/src/connections.c:3392 +#: ../clients/cli/connections.c:4042 #, c-format msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n" msgstr "" -#: ../cli/src/connections.c:3401 +#: ../clients/cli/connections.c:4051 msgid "Hello time [2]: " msgstr "" -#: ../cli/src/connections.c:3405 +#: ../clients/cli/connections.c:4055 #, c-format msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n" msgstr "" -#: ../cli/src/connections.c:3413 +#: ../clients/cli/connections.c:4063 msgid "Max age [20]: " msgstr "" -#: ../cli/src/connections.c:3417 +#: ../clients/cli/connections.c:4067 #, c-format msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n" msgstr "" -#: ../cli/src/connections.c:3425 +#: ../clients/cli/connections.c:4075 msgid "MAC address ageing time [300]: " msgstr "" -#: ../cli/src/connections.c:3429 +#: ../clients/cli/connections.c:4079 #, c-format msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n" msgstr "" +#: ../clients/cli/connections.c:4088 +#, c-format +msgid "Enable IGMP snooping %s" +msgstr "" + +#: ../clients/cli/connections.c:4093 +#, c-format +msgid "Error: 'multicast-snooping': %s.\n" +msgstr "" + #. Ask for optional 'bridge-slave' arguments. -#: ../cli/src/connections.c:3456 +#: ../clients/cli/connections.c:4120 msgid "bridge-slave" msgstr "" -#: ../cli/src/connections.c:3461 +#: ../clients/cli/connections.c:4125 msgid "Bridge port priority [32]: " msgstr "" -#: ../cli/src/connections.c:3474 +#: ../clients/cli/connections.c:4138 msgid "Bridge port STP path cost [100]: " msgstr "" -#: ../cli/src/connections.c:3488 +#: ../clients/cli/connections.c:4152 #, c-format msgid "Hairpin %s" msgstr "" -#: ../cli/src/connections.c:3493 +#: ../clients/cli/connections.c:4157 #, c-format msgid "Error: 'hairpin': %s.\n" msgstr "" #. Ask for optional 'olpc' arguments. -#: ../cli/src/connections.c:3520 ../libnm-glib/nm-device.c:1819 +#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855 +#: ../libnm/nm-device.c:1806 msgid "OLPC Mesh" msgstr "" -#: ../cli/src/connections.c:3525 +#: ../clients/cli/connections.c:4189 msgid "OLPC Mesh channel [1]: " msgstr "" -#: ../cli/src/connections.c:3528 +#: ../clients/cli/connections.c:4192 #, c-format msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n" msgstr "" -#: ../cli/src/connections.c:3536 +#: ../clients/cli/connections.c:4200 msgid "DHCP anycast MAC address [none]: " msgstr "" -#: ../clients/cli/connections.c:3905 -msgid "IPv4 address (IP[/plen]) [none]: " +#. Ask for optional 'adsl' arguments. +#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871 +#: ../libnm/nm-device.c:1822 +msgid "ADSL" msgstr "" -#: ../clients/cli/connections.c:3907 -msgid "IPv6 address (IP[/plen]) [none]: " +#: ../clients/cli/connections.c:4227 +#, c-format +msgid "ADSL encapsulation %s" msgstr "" -#: ../clients/cli/connections.c:3921 -#, c-format -msgid " Address successfully added: %s\n" +#. Ask for optional 'macvlan' arguments. +#: ../clients/cli/connections.c:4245 +msgid "macvlan" msgstr "" -#: ../clients/cli/connections.c:3923 +#: ../clients/cli/connections.c:4251 #, c-format -msgid " Warning: address already present: %s\n" +msgid "Tap %s" msgstr "" -#: ../cli/src/connections.c:3605 +#: ../clients/cli/connections.c:4256 #, c-format -msgid " Warning: ignoring garbage at the end: '%s'\n" +msgid "Error: 'tap': %s.\n" msgstr "" -#: ../cli/src/connections.c:3607 ../cli/src/connections.c:4464 -#: ../cli/src/connections.c:4527 ../cli/src/connections.c:4938 -#: ../cli/src/connections.c:4948 -msgid "Error: " +#. Ask for optional 'vxlan' arguments. +#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875 +#: ../libnm/nm-device.c:1826 +msgid "VXLAN" msgstr "" -#: ../clients/cli/connections.c:3947 -msgid "IPv4 gateway [none]: " +#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601 +msgid "Parent device [none]: " msgstr "" -#: ../clients/cli/connections.c:3950 -msgid "IPv6 gateway [none]: " +#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606 +#, c-format +msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n" msgstr "" -#: ../clients/cli/connections.c:3970 -#, c-format -msgid "Error: invalid gateway address '%s'\n" +#: ../clients/cli/connections.c:4291 +msgid "Local address [none]: " msgstr "" -#. Ask for IP addresses -#: ../cli/src/connections.c:3624 +#: ../clients/cli/connections.c:4296 #, c-format -msgid "Do you want to add IP addresses? %s" +msgid "Error: 'local': '%s' is not a valid IP address.\n" msgstr "" -#: ../cli/src/connections.c:3631 +#: ../clients/cli/connections.c:4305 +msgid "Minimum source port [0]: " +msgstr "" + +#: ../clients/cli/connections.c:4309 #, c-format -msgid "Press <Enter> to finish adding addresses.\n" +msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n" +msgstr "" + +#: ../clients/cli/connections.c:4318 +msgid "Maximum source port [0]: " msgstr "" -#: ../cli/src/connections.c:3777 +#: ../clients/cli/connections.c:4322 #, c-format -msgid "Error: 'parent': not valid without 'p-key'." +msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n" msgstr "" -#: ../cli/src/connections.c:3833 ../cli/src/connections.c:4854 -msgid "SSID: " +#: ../clients/cli/connections.c:4331 +msgid "Destination port [8472]: " msgstr "" -#: ../cli/src/connections.c:3836 ../cli/src/connections.c:4857 -msgid "Error: 'ssid' is required." +#: ../clients/cli/connections.c:4335 +#, c-format +msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n" msgstr "" -#: ../cli/src/connections.c:3900 -msgid "WiMAX NSP name: " +#: ../clients/cli/connections.c:4374 +msgid "IPv4 address (IP[/plen]) [none]: " msgstr "" -#: ../cli/src/connections.c:3903 -msgid "Error: 'nsp' is required." +#: ../clients/cli/connections.c:4376 +msgid "IPv6 address (IP[/plen]) [none]: " msgstr "" -#: ../cli/src/connections.c:3958 -msgid "PPPoE username: " +#: ../clients/cli/connections.c:4390 +#, c-format +msgid " Address successfully added: %s\n" msgstr "" -#: ../cli/src/connections.c:3961 -msgid "Error: 'username' is required." +#: ../clients/cli/connections.c:4392 +#, c-format +msgid " Warning: address already present: %s\n" msgstr "" -#: ../cli/src/connections.c:4032 -msgid "APN: " +#: ../clients/cli/connections.c:4394 +#, c-format +msgid " Warning: ignoring garbage at the end: '%s'\n" msgstr "" -#: ../cli/src/connections.c:4035 -msgid "Error: 'apn' is required." +#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605 +#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569 +#: ../clients/cli/connections.c:6602 +msgid "Error: " msgstr "" -#: ../cli/src/connections.c:4094 -msgid "Bluetooth device address: " +#: ../clients/cli/connections.c:4416 +msgid "IPv4 gateway [none]: " msgstr "" -#: ../cli/src/connections.c:4097 -msgid "Error: 'addr' is required." +#: ../clients/cli/connections.c:4419 +msgid "IPv6 gateway [none]: " msgstr "" -#: ../cli/src/connections.c:4140 +#: ../clients/cli/connections.c:4439 #, c-format -msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]." +msgid "Error: invalid gateway address '%s'\n" msgstr "" -#: ../cli/src/connections.c:4185 -msgid "VLAN parent device or connection UUID: " +#. Ask for IP addresses +#: ../clients/cli/connections.c:4452 +#, c-format +msgid "Do you want to add IP addresses? %s" msgstr "" -#: ../cli/src/connections.c:4188 -msgid "Error: 'dev' is required." +#: ../clients/cli/connections.c:4460 +#, c-format +msgid "Press <Enter> to finish adding addresses.\n" msgstr "" -#: ../cli/src/connections.c:4192 -msgid "VLAN ID <0-4095>: " +#. Ask for optional 'tun' arguments. +#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879 +#: ../libnm/nm-device.c:1830 +msgid "Tun" msgstr "" -#: ../cli/src/connections.c:4195 -msgid "Error: 'id' is required." +#: ../clients/cli/connections.c:4509 +msgid "User ID [none]: " msgstr "" -#: ../cli/src/connections.c:4201 -#, c-format -msgid "Error: 'id': '%s' is not valid; use <0-4095>." +#: ../clients/cli/connections.c:4522 +msgid "Group ID [none]: " msgstr "" -#: ../cli/src/connections.c:4211 +#: ../clients/cli/connections.c:4536 #, c-format -msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC." +msgid "Enable PI %s" msgstr "" -#: ../cli/src/connections.c:4346 +#: ../clients/cli/connections.c:4541 #, c-format -msgid "Error: 'mode': %s." +msgid "Error: 'pi': %s.\n" msgstr "" -#: ../cli/src/connections.c:4355 +#: ../clients/cli/connections.c:4549 #, c-format -msgid "Error: 'primary': '%s' is not a valid interface name." -msgstr "" - -#: ../cli/src/connections.c:4405 ../cli/src/connections.c:4505 -#: ../cli/src/connections.c:4712 -msgid "Error: 'master' is required." +msgid "Enable VNET header %s" msgstr "" -#: ../cli/src/connections.c:4411 ../cli/src/connections.c:4511 -#: ../cli/src/connections.c:4718 +#: ../clients/cli/connections.c:4554 #, c-format -msgid "Warning: master='%s' doesn't refer to any existing profile.\n" +msgid "Error: 'vnet-hdr': %s.\n" msgstr "" -#: ../cli/src/connections.c:4414 ../cli/src/connections.c:4519 -#: ../cli/src/connections.c:4721 +#: ../clients/cli/connections.c:4562 #, c-format -msgid "" -"Warning: 'type' is currently ignored. We only support ethernet slaves for " -"now.\n" +msgid "Enable multi queue %s" msgstr "" -#: ../cli/src/connections.c:4614 +#: ../clients/cli/connections.c:4567 #, c-format -msgid "Error: 'stp': %s." +msgid "Error: 'multi-queue': %s.\n" msgstr "" -#: ../cli/src/connections.c:4748 -#, c-format -msgid "Error: 'hairpin': %s." +#. Ask for optional 'ip-tunnel' arguments. +#: ../clients/cli/connections.c:4581 +msgid "IP Tunnel" msgstr "" -#: ../cli/src/connections.c:4801 -msgid "Error: 'vpn-type' is required." +#: ../clients/cli/connections.c:4586 +msgid "Local endpoint [none]: " msgstr "" -#: ../cli/src/connections.c:4808 +#: ../clients/cli/connections.c:4592 #, c-format -msgid "Warning: 'vpn-type': %s not known.\n" +msgid "Error: 'local': '%s' is not valid; must be an IP address\n" msgstr "" -#: ../cli/src/connections.c:4870 +#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184 #, c-format -msgid "Error: 'channel': '%s' is not valid; use <1-13>." +msgid "Error: <setting>.<property> argument is missing." msgstr "" -#: ../cli/src/connections.c:4905 +#: ../clients/cli/connections.c:4663 #, c-format -msgid "Error: '%s' is not a valid connection type." +msgid "Error: value for '%s' is missing." msgstr "" -#: ../clients/cli/connections.c:5281 +#: ../clients/cli/connections.c:4681 #, c-format -msgid "Error: IPv4 gateway specified without IPv4 addresses" +msgid "Error: invalid <setting>.<property> '%s'." msgstr "" -#: ../clients/cli/connections.c:5285 +#: ../clients/cli/connections.c:4689 #, c-format -msgid "Error: multiple IPv4 gateways specified" +msgid "Error: invalid or not allowed setting '%s': %s." msgstr "" -#: ../clients/cli/connections.c:5289 +#: ../clients/cli/connections.c:4700 #, c-format -msgid "Error: Invalid IPv4 gateway '%s'" +msgid "Error: don't know how to create '%s' setting." msgstr "" -#: ../clients/cli/connections.c:5314 +#: ../clients/cli/connections.c:4710 #, c-format -msgid "Error: IPv6 gateway specified without IPv6 addresses" +msgid "Error: invalid property '%s': %s." msgstr "" -#: ../clients/cli/connections.c:5318 +#: ../clients/cli/connections.c:4722 #, c-format -msgid "Error: multiple IPv6 gateways specified" +msgid "Error: failed to modify %s.%s: %s." msgstr "" -#: ../clients/cli/connections.c:5322 +#: ../clients/cli/connections.c:4741 #, c-format -msgid "Error: Invalid IPv6 gateway '%s'" +msgid "Error: failed to remove a value from %s.%s: %s." msgstr "" -#: ../clients/cli/connections.c:5382 +#: ../clients/cli/connections.c:4775 #, c-format -msgid "Error: Failed to add '%s' connection: %s" +msgid "" +"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead." msgstr "" -#: ../cli/src/connections.c:5007 -#, c-format -msgid "Connection '%s' (%s) successfully added.\n" +#: ../clients/cli/connections.c:4783 +msgid "Error: redundant 'master' option." msgstr "" -#: ../cli/src/connections.c:5221 -#, c-format -msgid "Error: 'type' argument is required." +#: ../clients/cli/connections.c:4796 +msgid "Error: 'master' is required." msgstr "" -#: ../cli/src/connections.c:5229 +#: ../clients/cli/connections.c:4950 #, c-format -msgid "Error: invalid connection type; %s." +msgid "Error: 'parent': not valid without 'p-key'." msgstr "" -#: ../cli/src/connections.c:5238 -#, c-format -msgid "Error: 'autoconnect': %s." +#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967 +msgid "SSID: " msgstr "" -#: ../cli/src/connections.c:5248 -#, c-format -msgid "Error: 'save': %s." +#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970 +msgid "Error: 'ssid' is required." msgstr "" -#: ../cli/src/connections.c:5264 -msgid "Interface name [*]: " +#: ../clients/cli/connections.c:5072 +msgid "WiMAX NSP name: " msgstr "" -#: ../cli/src/connections.c:5269 -#, c-format -msgid "Error: 'ifname' argument is required." +#: ../clients/cli/connections.c:5075 +msgid "Error: 'nsp' is required." msgstr "" -#: ../cli/src/connections.c:5276 -#, c-format -msgid "Error: 'ifname': '%s' is not a valid interface nor '*'." +#: ../clients/cli/connections.c:5127 +msgid "PPPoE username: " msgstr "" -#: ../cli/src/connections.c:6064 -#, c-format -msgid "['%s' setting values]\n" +#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037 +msgid "Error: 'username' is required." msgstr "" -#. TRANSLATORS: do not translate command names and keywords before :: -#. * However, you should translate terms enclosed in <>. -#. -#: ../clients/cli/connections.c:6639 -#, c-format -msgid "" -"---[ Main menu ]---\n" -"goto [<setting> | <prop>] :: go to a setting or property\n" +#: ../clients/cli/connections.c:5199 +msgid "APN: " +msgstr "" + +#: ../clients/cli/connections.c:5202 +msgid "Error: 'apn' is required." +msgstr "" + +#: ../clients/cli/connections.c:5260 +msgid "Bluetooth device address: " +msgstr "" + +#: ../clients/cli/connections.c:5263 +msgid "Error: 'addr' is required." +msgstr "" + +#: ../clients/cli/connections.c:5304 +#, c-format +msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]." +msgstr "" + +#: ../clients/cli/connections.c:5348 +msgid "VLAN parent device or connection UUID: " +msgstr "" + +#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108 +msgid "Error: 'dev' is required." +msgstr "" + +#: ../clients/cli/connections.c:5355 +msgid "VLAN ID <0-4094>: " +msgstr "" + +#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424 +msgid "Error: 'id' is required." +msgstr "" + +#: ../clients/cli/connections.c:5364 +#, c-format +msgid "Error: 'id': '%s' is not valid; use <0-4094>." +msgstr "" + +#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116 +#, c-format +msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC." +msgstr "" + +#: ../clients/cli/connections.c:5506 +#, c-format +msgid "Error: 'mode': %s." +msgstr "" + +#: ../clients/cli/connections.c:5515 +#, c-format +msgid "Error: 'primary': '%s' is not a valid interface name." +msgstr "" + +#: ../clients/cli/connections.c:5738 +#, c-format +msgid "Error: 'stp': %s." +msgstr "" + +#: ../clients/cli/connections.c:5747 +#, c-format +msgid "Error: 'multicast-snooping': %s." +msgstr "" + +#: ../clients/cli/connections.c:5866 +#, c-format +msgid "Error: 'hairpin': %s." +msgstr "" + +#: ../clients/cli/connections.c:5915 +msgid "Error: 'vpn-type' is required." +msgstr "" + +#: ../clients/cli/connections.c:5922 +#, c-format +msgid "Warning: 'vpn-type': %s not known.\n" +msgstr "" + +#: ../clients/cli/connections.c:5983 +#, c-format +msgid "Error: 'channel': '%s' is not valid; use <1-13>." +msgstr "" + +#: ../clients/cli/connections.c:6034 +msgid "Username: " +msgstr "" + +#: ../clients/cli/connections.c:6043 +#, c-format +msgid "Protocol %s" +msgstr "" + +#: ../clients/cli/connections.c:6046 +msgid "Error: 'protocol' is required." +msgstr "" + +#: ../clients/cli/connections.c:6105 +msgid "MACVLAN parent device or connection UUID: " +msgstr "" + +#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205 +#: ../clients/cli/connections.c:6307 +msgid "Error: 'mode' is required." +msgstr "" + +#: ../clients/cli/connections.c:6131 +msgid "Error: 'mode' is not valid." +msgstr "" + +#: ../clients/cli/connections.c:6144 +#, c-format +msgid "Error: 'tap': %s." +msgstr "" + +#: ../clients/cli/connections.c:6230 +#, c-format +msgid "Error: 'pi': %s." +msgstr "" + +#: ../clients/cli/connections.c:6241 +#, c-format +msgid "Error: 'vnet-hdr': %s." +msgstr "" + +#: ../clients/cli/connections.c:6252 +#, c-format +msgid "Error: 'multi-queue': %s." +msgstr "" + +#: ../clients/cli/connections.c:6321 +#, c-format +msgid "Error: 'mode': '%s' is not valid, use one of %s" +msgstr "" + +#: ../clients/cli/connections.c:6327 +msgid "Remote endpoint: " +msgstr "" + +#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432 +msgid "Error: 'remote' is required." +msgstr "" + +#: ../clients/cli/connections.c:6337 +#, c-format +msgid "Error: 'remote': '%s' is not valid; must be an IP address" +msgstr "" + +#: ../clients/cli/connections.c:6351 +#, c-format +msgid "Error: 'local': '%s' is not valid; must be an IP address" +msgstr "" + +#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455 +#, c-format +msgid "Error: 'dev': '%s' is neither UUID nor interface name." +msgstr "" + +#: ../clients/cli/connections.c:6421 +msgid "VXLAN ID: " +msgstr "" + +#: ../clients/cli/connections.c:6429 +msgid "Remote: " +msgstr "" + +#: ../clients/cli/connections.c:6438 +#, c-format +msgid "Error: 'id': '%s' is not valid; use <0-16777215>." +msgstr "" + +#: ../clients/cli/connections.c:6464 +#, c-format +msgid "Error: 'remote': '%s' is not a valid IP address" +msgstr "" + +#: ../clients/cli/connections.c:6473 +#, c-format +msgid "Error: 'local': '%s' is not a valid IP address" +msgstr "" + +#: ../clients/cli/connections.c:6482 +#, c-format +msgid "Error: 'source-port-min': %s is not valid; use <0-65535>." +msgstr "" + +#: ../clients/cli/connections.c:6491 +#, c-format +msgid "Error: 'source-port-max': %s is not valid; use <0-65535>." +msgstr "" + +#: ../clients/cli/connections.c:6500 +#, c-format +msgid "Error: 'destination-port': %s is not valid; use <0-65535>." +msgstr "" + +#: ../clients/cli/connections.c:6540 +#, c-format +msgid "Error: '%s' is not a valid connection type." +msgstr "" + +#: ../clients/cli/connections.c:6581 +#, c-format +msgid "Error: IPv4 gateway specified without IPv4 addresses" +msgstr "" + +#: ../clients/cli/connections.c:6585 +#, c-format +msgid "Error: multiple IPv4 gateways specified" +msgstr "" + +#: ../clients/cli/connections.c:6589 +#, c-format +msgid "Error: Invalid IPv4 gateway '%s'" +msgstr "" + +#: ../clients/cli/connections.c:6614 +#, c-format +msgid "Error: IPv6 gateway specified without IPv6 addresses" +msgstr "" + +#: ../clients/cli/connections.c:6618 +#, c-format +msgid "Error: multiple IPv6 gateways specified" +msgstr "" + +#: ../clients/cli/connections.c:6622 +#, c-format +msgid "Error: Invalid IPv6 gateway '%s'" +msgstr "" + +#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223 +#, c-format +msgid "Error: Failed to add '%s' connection: %s" +msgstr "" + +#: ../clients/cli/connections.c:6675 +#, c-format +msgid "Connection '%s' (%s) successfully added.\n" +msgstr "" + +#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678 +#, c-format +msgid "Error: 'type' argument is required." +msgstr "" + +#: ../clients/cli/connections.c:6959 +#, c-format +msgid "Error: invalid connection type; %s." +msgstr "" + +#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164 +#, c-format +msgid "Error: 'autoconnect': %s." +msgstr "" + +#: ../clients/cli/connections.c:6978 +#, c-format +msgid "Error: 'save': %s." +msgstr "" + +#: ../clients/cli/connections.c:6995 +msgid "Interface name [*]: " +msgstr "" + +#: ../clients/cli/connections.c:7000 +#, c-format +msgid "Error: 'ifname' argument is required." +msgstr "" + +#: ../clients/cli/connections.c:7002 +#, c-format +msgid "Error: mandatory 'ifname' not seen before '%s'." +msgstr "" + +#: ../clients/cli/connections.c:7011 +#, c-format +msgid "Error: 'ifname': '%s' is not a valid interface nor '*'." +msgstr "" + +#: ../clients/cli/connections.c:8035 +#, c-format +msgid "['%s' setting values]\n" +msgstr "" + +#. TRANSLATORS: do not translate command names and keywords before :: +#. * However, you should translate terms enclosed in <>. +#. +#: ../clients/cli/connections.c:8117 +#, c-format +msgid "" +"---[ Main menu ]---\n" +"goto [<setting> | <prop>] :: go to a setting or property\n" "remove <setting>[.<prop>] | <prop> :: remove setting or reset property " "value\n" "set [<setting>.<prop> <value>] :: set property value\n" @@ -2012,7 +2490,7 @@ "quit :: exit nmcli\n" msgstr "" -#: ../cli/src/connections.c:6173 +#: ../clients/cli/connections.c:8144 #, c-format msgid "" "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n" @@ -2024,7 +2502,7 @@ " nmcli> goto ipv4.addresses\n" msgstr "" -#: ../cli/src/connections.c:6180 +#: ../clients/cli/connections.c:8151 #, c-format msgid "" "remove <setting>[.<prop>] :: remove setting or reset property value\n" @@ -2037,7 +2515,7 @@ " nmcli> remove eth.mtu\n" msgstr "" -#: ../cli/src/connections.c:6187 +#: ../clients/cli/connections.c:8158 #, c-format msgid "" "set [<setting>.<prop> <value>] :: set property value\n" @@ -2047,7 +2525,7 @@ "Example: nmcli> set con.id My connection\n" msgstr "" -#: ../cli/src/connections.c:6192 +#: ../clients/cli/connections.c:8163 #, c-format msgid "" "describe [<setting>.<prop>] :: describe property\n" @@ -2056,7 +2534,7 @@ "see all NM settings and properties.\n" msgstr "" -#: ../cli/src/connections.c:6197 +#: ../clients/cli/connections.c:8168 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -2066,7 +2544,7 @@ "Example: nmcli ipv4> print all\n" msgstr "" -#: ../clients/cli/connections.c:6695 +#: ../clients/cli/connections.c:8173 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -2081,7 +2559,7 @@ " nmcli bond> verify\n" msgstr "" -#: ../cli/src/connections.c:6209 +#: ../clients/cli/connections.c:8182 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -2097,7 +2575,7 @@ "profile must be deleted.\n" msgstr "" -#: ../cli/src/connections.c:6220 +#: ../clients/cli/connections.c:8193 #, c-format msgid "" "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n" @@ -2110,46 +2588,37 @@ "specified)\n" msgstr "" -#: ../cli/src/connections.c:6227 ../cli/src/connections.c:6384 +#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359 #, c-format msgid "" "back :: go to upper menu level\n" "\n" msgstr "" -#: ../cli/src/connections.c:6230 +#: ../clients/cli/connections.c:8203 #, c-format msgid "" "help/? [<command>] :: help for the nmcli commands\n" "\n" msgstr "" -#: ../clients/cli/connections.c:6728 +#: ../clients/cli/connections.c:8206 #, c-format msgid "" "nmcli [<conf-option> <value>] :: nmcli configuration\n" "\n" "Configures nmcli. The following options are available:\n" -"status-line yes | no [default: no]\n" -"save-confirmation yes | no [default: yes]\n" -"show-secrets yes | no [default: no]\n" -"prompt-color <0-8> [default: 0]\n" -" 0 = normal\n" -" 1 = black\n" -" 2 = red\n" -" 3 = green\n" -" 4 = yellow\n" -" 5 = blue\n" -" 6 = magenta\n" -" 7 = cyan\n" -" 8 = white\n" -"\n" +"status-line yes | no [default: no]\n" +"save-confirmation yes | no [default: yes]\n" +"show-secrets yes | no [default: no]\n" +"prompt-color <color> | <0-8> [default: 0]\n" +"%s\n" "Examples: nmcli> nmcli status-line yes\n" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" msgstr "" -#: ../cli/src/connections.c:6253 ../cli/src/connections.c:6390 +#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365 #, c-format msgid "" "quit :: exit nmcli\n" @@ -2158,8 +2627,8 @@ "user is asked to confirm the action.\n" msgstr "" -#: ../cli/src/connections.c:6258 ../cli/src/connections.c:6395 -#: ../cli/src/connections.c:6783 ../cli/src/connections.c:7676 +#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370 +#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742 #, c-format msgid "Unknown command: '%s'\n" msgstr "" @@ -2167,7 +2636,7 @@ #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../cli/src/connections.c:6324 +#: ../clients/cli/connections.c:8299 #, c-format msgid "" "---[ Property menu ]---\n" @@ -2183,7 +2652,7 @@ "quit :: exit nmcli\n" msgstr "" -#: ../cli/src/connections.c:6349 +#: ../clients/cli/connections.c:8324 #, c-format msgid "" "set [<value>] :: set new value\n" @@ -2191,7 +2660,7 @@ "This command sets provided <value> to this property\n" msgstr "" -#: ../cli/src/connections.c:6353 +#: ../clients/cli/connections.c:8328 #, c-format msgid "" "add [<value>] :: append new value to the property\n" @@ -2201,7 +2670,7 @@ "(same as 'set').\n" msgstr "" -#: ../cli/src/connections.c:6359 +#: ../clients/cli/connections.c:8334 #, c-format msgid "" "change :: change current value\n" @@ -2209,7 +2678,7 @@ "Displays current value and allows editing it.\n" msgstr "" -#: ../cli/src/connections.c:6363 +#: ../clients/cli/connections.c:8338 #, c-format msgid "" "remove [<value>|<index>|<option name>] :: delete the value\n" @@ -2229,7 +2698,7 @@ "\n" msgstr "" -#: ../cli/src/connections.c:6374 +#: ../clients/cli/connections.c:8349 #, c-format msgid "" "describe :: describe property\n" @@ -2238,7 +2707,7 @@ "see all NM settings and properties.\n" msgstr "" -#: ../cli/src/connections.c:6379 +#: ../clients/cli/connections.c:8354 #, c-format msgid "" "print [property|setting|connection] :: print property (setting, connection) " @@ -2248,100 +2717,101 @@ "the whole setting or connection.\n" msgstr "" -#: ../cli/src/connections.c:6387 +#: ../clients/cli/connections.c:8362 #, c-format msgid "" "help/? [<command>] :: help for nmcli commands\n" "\n" msgstr "" -#: ../cli/src/connections.c:6474 +#: ../clients/cli/connections.c:8460 #, c-format msgid "Error: Connection activation failed.\n" msgstr "" -#: ../cli/src/connections.c:6552 +#: ../clients/cli/connections.c:8543 #, c-format msgid "Error: setting '%s' is mandatory and cannot be removed.\n" msgstr "" #. TRANSLATORS: status line in nmcli connection editor -#: ../cli/src/connections.c:6570 +#: ../clients/cli/connections.c:8561 #, c-format msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n" msgstr "" -#: ../cli/src/connections.c:6605 +#: ../clients/cli/connections.c:8597 #, c-format msgid "The connection is not saved. Do you really want to quit? %s" msgstr "" -#: ../cli/src/connections.c:6650 +#: ../clients/cli/connections.c:8646 #, c-format msgid "" "The connection profile has been removed from another client. You may type " "'save' in the main menu to restore it.\n" msgstr "" -#: ../cli/src/connections.c:7085 ../cli/src/connections.c:7140 +#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093 +#: ../clients/cli/connections.c:9151 #, c-format msgid "Allowed values for '%s' property: %s\n" msgstr "" -#: ../cli/src/connections.c:6672 ../cli/src/connections.c:7087 -#: ../cli/src/connections.c:7142 +#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097 +#: ../clients/cli/connections.c:9155 #, c-format msgid "Enter '%s' value: " msgstr "" -#: ../cli/src/connections.c:6687 ../cli/src/connections.c:6705 -#: ../cli/src/connections.c:7091 ../cli/src/connections.c:7147 +#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712 +#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160 #, c-format msgid "Error: failed to set '%s' property: %s\n" msgstr "" -#: ../cli/src/connections.c:6699 +#: ../clients/cli/connections.c:8706 #, c-format msgid "Edit '%s' value: " msgstr "" -#: ../cli/src/connections.c:6726 +#: ../clients/cli/connections.c:8735 #, c-format msgid "Error: %s\n" msgstr "" -#: ../cli/src/connections.c:6732 ../cli/src/connections.c:7226 -#: ../cli/src/connections.c:7267 +#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242 +#: ../clients/cli/connections.c:9290 #, c-format msgid "Error: failed to remove value of '%s': %s\n" msgstr "" -#: ../cli/src/connections.c:6753 +#: ../clients/cli/connections.c:8762 #, c-format msgid "Unknown command argument: '%s'\n" msgstr "" -#: ../cli/src/connections.c:6879 +#: ../clients/cli/connections.c:8867 #, c-format msgid "Available settings: %s\n" msgstr "" -#: ../cli/src/connections.c:6888 +#: ../clients/cli/connections.c:8879 #, c-format msgid "Error: invalid setting name; %s\n" msgstr "" -#: ../cli/src/connections.c:6905 +#: ../clients/cli/connections.c:8896 #, c-format msgid "Available properties: %s\n" msgstr "" -#: ../cli/src/connections.c:6913 +#: ../clients/cli/connections.c:8904 #, c-format msgid "Error: property %s\n" msgstr "" -#: ../cli/src/connections.c:6954 +#: ../clients/cli/connections.c:8945 #, c-format msgid "" "Saving the connection with 'autoconnect=yes'. That might result in an " @@ -2349,523 +2819,622 @@ "Do you still want to save? %s" msgstr "" -#: ../cli/src/connections.c:7029 +#: ../clients/cli/connections.c:9035 #, c-format msgid "You may edit the following settings: %s\n" msgstr "" -#: ../cli/src/connections.c:7056 +#: ../clients/cli/connections.c:9063 #, c-format msgid "" "The connection profile has been removed from another client. You may type " "'save' to restore it.\n" msgstr "" -#: ../cli/src/connections.c:7095 ../cli/src/connections.c:7309 +#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335 #, c-format msgid "Error: no setting selected; valid are [%s]\n" msgstr "" -#: ../cli/src/connections.c:7096 +#: ../clients/cli/connections.c:9106 #, c-format msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n" msgstr "" -#: ../cli/src/connections.c:7110 ../cli/src/connections.c:7246 -#: ../cli/src/connections.c:7326 +#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269 +#: ../clients/cli/connections.c:9357 #, c-format msgid "Error: invalid setting argument '%s'; valid are [%s]\n" msgstr "" -#: ../cli/src/connections.c:7120 +#: ../clients/cli/connections.c:9130 #, c-format msgid "Error: missing setting for '%s' property\n" msgstr "" -#: ../cli/src/connections.c:7127 +#: ../clients/cli/connections.c:9137 #, c-format msgid "Error: invalid property: %s\n" msgstr "" -#: ../cli/src/connections.c:7174 +#: ../clients/cli/connections.c:9190 #, c-format msgid "Error: unknown setting '%s'\n" msgstr "" -#: ../cli/src/connections.c:7187 +#: ../clients/cli/connections.c:9203 #, c-format msgid "You may edit the following properties: %s\n" msgstr "" -#: ../cli/src/connections.c:7231 +#: ../clients/cli/connections.c:9247 #, c-format msgid "Error: no argument given; valid are [%s]\n" msgstr "" -#: ../cli/src/connections.c:7244 +#: ../clients/cli/connections.c:9266 #, c-format msgid "Setting '%s' is not present in the connection.\n" msgstr "" -#: ../cli/src/connections.c:7285 +#: ../clients/cli/connections.c:9311 #, c-format msgid "Error: %s properties, nor it is a setting name.\n" msgstr "" -#: ../cli/src/connections.c:7310 +#: ../clients/cli/connections.c:9336 #, c-format msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n" msgstr "" -#: ../cli/src/connections.c:7351 +#: ../clients/cli/connections.c:9385 #, c-format msgid "Error: invalid property: %s, neither a valid setting name.\n" msgstr "" -#: ../cli/src/connections.c:7380 +#: ../clients/cli/connections.c:9417 #, c-format msgid "Error: unknown setting: '%s'\n" msgstr "" -#: ../cli/src/connections.c:7385 +#: ../clients/cli/connections.c:9422 #, c-format msgid "Error: '%s' setting not present in the connection\n" msgstr "" -#: ../cli/src/connections.c:7410 +#: ../clients/cli/connections.c:9450 #, c-format msgid "Error: invalid property: %s%s\n" msgstr "" -#: ../cli/src/connections.c:7412 +#: ../clients/cli/connections.c:9452 msgid ", neither a valid setting name" msgstr "" -#: ../clients/cli/connections.c:7966 +#: ../clients/cli/connections.c:9469 #, c-format msgid "Invalid verify option: %s\n" msgstr "" -#: ../cli/src/connections.c:7432 +#: ../clients/cli/connections.c:9477 #, c-format msgid "Verify setting '%s': %s\n" msgstr "" -#: ../cli/src/connections.c:7439 +#: ../clients/cli/connections.c:9492 #, c-format msgid "Verify connection: %s\n" msgstr "" -#: ../clients/cli/connections.c:7992 +#: ../clients/cli/connections.c:9495 #, c-format msgid "The error cannot be fixed automatically.\n" msgstr "" -#: ../cli/src/connections.c:7457 +#: ../clients/cli/connections.c:9512 #, c-format msgid "Error: invalid argument '%s'\n" msgstr "" -#: ../clients/cli/connections.c:8042 +#: ../clients/cli/connections.c:9545 #, c-format msgid "Error: Failed to save '%s' (%s) connection: %s\n" msgstr "" -#: ../cli/src/connections.c:7499 +#: ../clients/cli/connections.c:9552 #, c-format msgid "Connection '%s' (%s) successfully saved.\n" msgstr "" -#: ../cli/src/connections.c:7500 +#: ../clients/cli/connections.c:9553 #, c-format msgid "Connection '%s' (%s) successfully updated.\n" msgstr "" -#: ../cli/src/connections.c:7534 +#: ../clients/cli/connections.c:9586 #, c-format msgid "Error: connection verification failed: %s\n" msgstr "" -#: ../cli/src/connections.c:7535 +#: ../clients/cli/connections.c:9587 msgid "(unknown error)" msgstr "" -#: ../clients/cli/connections.c:8085 +#: ../clients/cli/connections.c:9588 #, c-format msgid "You may try running 'verify fix' to fix errors.\n" msgstr "" -#: ../cli/src/connections.c:7556 +#: ../clients/cli/connections.c:9610 #, c-format msgid "Error: connection is not saved. Type 'save' first.\n" msgstr "" -#: ../cli/src/connections.c:7560 +#: ../clients/cli/connections.c:9614 #, c-format msgid "Error: connection is not valid: %s\n" msgstr "" -#: ../cli/src/connections.c:7571 +#: ../clients/cli/connections.c:9624 #, c-format msgid "Error: Cannot activate connection: %s.\n" msgstr "" -#: ../clients/cli/connections.c:8131 +#: ../clients/cli/connections.c:9634 #, c-format msgid "Error: Failed to activate '%s' (%s) connection: %s\n" msgstr "" -#: ../cli/src/connections.c:7587 +#: ../clients/cli/connections.c:9640 #, c-format msgid "Monitoring connection activation (press any key to continue)\n" msgstr "" -#: ../cli/src/connections.c:7625 +#: ../clients/cli/connections.c:9678 #, c-format msgid "Error: status-line: %s\n" msgstr "" -#: ../cli/src/connections.c:7633 +#: ../clients/cli/connections.c:9686 #, c-format msgid "Error: save-confirmation: %s\n" msgstr "" -#: ../clients/cli/connections.c:8191 +#: ../clients/cli/connections.c:9694 #, c-format msgid "Error: show-secrets: %s\n" msgstr "" -#: ../cli/src/connections.c:7641 +#: ../clients/cli/connections.c:9703 #, c-format -msgid "Error: bad color number: '%s'; use <0-8>\n" +msgid "Error: bad color: %s\n" msgstr "" -#: ../cli/src/connections.c:7653 +#: ../clients/cli/connections.c:9717 #, c-format msgid "Current nmcli configuration:\n" msgstr "" -#: ../cli/src/connections.c:7661 +#: ../clients/cli/connections.c:9727 #, c-format msgid "Invalid configuration option '%s'; allowed [%s]\n" msgstr "" -#: ../cli/src/connections.c:7904 +#: ../clients/cli/connections.c:9982 #, c-format msgid "Error: only one of 'id', uuid, or 'path' can be provided." msgstr "" -#: ../cli/src/connections.c:7916 ../cli/src/connections.c:8103 -#: ../cli/src/connections.c:8110 +#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171 +#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306 +#: ../clients/cli/connections.c:10782 #, c-format msgid "Error: Unknown connection '%s'." msgstr "" -#: ../cli/src/connections.c:7931 +#: ../clients/cli/connections.c:10012 #, c-format msgid "" "Warning: editing existing connection '%s'; 'type' argument is ignored\n" msgstr "" -#: ../cli/src/connections.c:7934 +#: ../clients/cli/connections.c:10015 #, c-format msgid "" "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n" msgstr "" -#: ../cli/src/connections.c:7948 +#: ../clients/cli/connections.c:10029 #, c-format msgid "Valid connection types: %s\n" msgstr "" -#: ../cli/src/connections.c:7950 +#: ../clients/cli/connections.c:10031 #, c-format msgid "Error: invalid connection type; %s\n" msgstr "" -#: ../cli/src/connections.c:7986 +#: ../clients/cli/connections.c:10070 #, c-format msgid "===| nmcli interactive connection editor |===" msgstr "" -#: ../cli/src/connections.c:7989 +#: ../clients/cli/connections.c:10073 #, c-format msgid "Editing existing '%s' connection: '%s'" msgstr "" -#: ../cli/src/connections.c:7991 +#: ../clients/cli/connections.c:10075 #, c-format msgid "Adding a new '%s' connection" msgstr "" -#: ../cli/src/connections.c:7993 +#: ../clients/cli/connections.c:10077 #, c-format msgid "Type 'help' or '?' for available commands." msgstr "" -#: ../cli/src/connections.c:7995 +#: ../clients/cli/connections.c:10079 #, c-format msgid "Type 'describe [<setting>.<prop>]' for detailed property description." msgstr "" -#: ../clients/cli/connections.c:8603 +#: ../clients/cli/connections.c:10117 #, c-format msgid "Error: Failed to modify connection '%s': %s" msgstr "" -#: ../cli/src/connections.c:8037 +#: ../clients/cli/connections.c:10124 #, c-format msgid "Connection '%s' (%s) successfully modified.\n" msgstr "" -#: ../cli/src/connections.c:8078 +#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262 +#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747 #, c-format msgid "Error: No arguments provided." msgstr "" -#: ../cli/src/connections.c:8097 +#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294 +#: ../clients/cli/connections.c:10776 #, c-format msgid "Error: connection ID is missing." msgstr "" -#: ../cli/src/connections.c:8119 ../cli/src/connections.c:8132 +#: ../clients/cli/connections.c:10228 #, c-format -msgid "Error: <setting>.<property> argument is missing." +msgid "%s (%s) cloned as %s (%s).\n" msgstr "" -#: ../cli/src/connections.c:8137 +#: ../clients/cli/connections.c:10260 +msgid "New connection name: " +msgstr "" + +#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299 #, c-format -msgid "Error: value for '%s' is missing." +msgid "Error: <new name> argument is missing." msgstr "" -#: ../cli/src/connections.c:8155 +#: ../clients/cli/connections.c:10287 #, c-format -msgid "Error: invalid <setting>.<property> '%s'." +msgid "Error: unexpected extra argument '%s'." msgstr "" -#: ../cli/src/connections.c:8163 +#: ../clients/cli/connections.c:10356 #, c-format -msgid "Error: invalid or not allowed setting '%s': %s." +msgid "Error: not all connections deleted." msgstr "" -#: ../cli/src/connections.c:8184 +#: ../clients/cli/connections.c:10357 #, c-format -msgid "Error: invalid property '%s': %s." +msgid "Error: Connection deletion failed: %s" msgstr "" -#: ../cli/src/connections.c:8195 +#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547 #, c-format -msgid "Error: failed to modify %s.%s: %s." +msgid "Error: unknown connection '%s'\n" msgstr "" -#: ../cli/src/connections.c:8213 +#: ../clients/cli/connections.c:10433 #, c-format -msgid "Error: failed to remove a value from %s.%s: %s." +msgid "Error: no connection provided." msgstr "" -#: ../clients/cli/connections.c:8808 +#. truncate trailing ", " +#: ../clients/cli/connections.c:10458 #, c-format -msgid "Error: not all connections deleted." +msgid "Error: cannot delete unknown connection(s): %s." msgstr "" -#: ../cli/src/connections.c:8249 +#: ../clients/cli/connections.c:10470 #, c-format -msgid "Error: Connection deletion failed: %s" +msgid "%s: connection profile changed\n" msgstr "" -#: ../clients/cli/connections.c:8871 +#: ../clients/cli/connections.c:10496 #, c-format -msgid "Error: unknown connection '%s'\n" +msgid "%s: connection profile created\n" msgstr "" -#: ../clients/cli/connections.c:8885 +#: ../clients/cli/connections.c:10505 #, c-format -msgid "Error: no connection provided." +msgid "%s: connection profile removed\n" msgstr "" -#. truncate trailing ", " -#: ../cli/src/connections.c:8356 +#: ../clients/cli/connections.c:10548 #, c-format -msgid "Error: cannot delete unknown connection(s): %s." +msgid "Error: not all connections found." msgstr "" -#: ../clients/cli/connections.c:8934 +#: ../clients/cli/connections.c:10571 #, c-format msgid "Error: failed to reload connections: %s." msgstr "" -#: ../clients/cli/connections.c:8973 +#: ../clients/cli/connections.c:10603 #, c-format msgid "Error: failed to load connection: %s." msgstr "" -#: ../cli/src/connections.c:8427 +#: ../clients/cli/connections.c:10611 #, c-format msgid "Could not load file '%s'\n" msgstr "" -#: ../cli/src/connections.c:8612 +#: ../clients/cli/connections.c:10620 +msgid "File to import: " +msgstr "" + +#: ../clients/cli/connections.c:10655 +#, c-format +msgid "Warning: 'type' already specified, ignoring extra one.\n" +msgstr "" + +#: ../clients/cli/connections.c:10666 +#, c-format +msgid "Warning: 'file' already specified, ignoring extra one.\n" +msgstr "" + +#: ../clients/cli/connections.c:10668 +#, c-format +msgid "Unknown parameter: %s" +msgstr "" + +#: ../clients/cli/connections.c:10683 +#, c-format +msgid "Error: 'file' argument is required." +msgstr "" + +#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798 +#, c-format +msgid "Error: failed to load VPN plugin: %s." +msgstr "" + +#: ../clients/cli/connections.c:10699 +#, c-format +msgid "Error: failed to import '%s': %s." +msgstr "" + +#: ../clients/cli/connections.c:10745 +msgid "Output file name: " +msgstr "" + +#: ../clients/cli/connections.c:10769 +#, c-format +msgid "Error: unknown extra argument: '%s'." +msgstr "" + +#: ../clients/cli/connections.c:10789 +#, c-format +msgid "Error: the connection is not VPN." +msgstr "" + +#: ../clients/cli/connections.c:10810 +#, c-format +msgid "Error: failed to create temporary file %s." +msgstr "" + +#: ../clients/cli/connections.c:10819 +#, c-format +msgid "Error: failed to export '%s': %s." +msgstr "" + +#: ../clients/cli/connections.c:10830 +#, c-format +msgid "Error: failed to read temporary file '%s': %s." +msgstr "" + +#: ../clients/cli/connections.c:10976 +#, c-format +msgid "incorrect string '%s' of '--order' option" +msgstr "" + +#: ../clients/cli/connections.c:11002 +#, c-format +msgid "incorrect item '%s' in '--order' option" +msgstr "" + +#: ../clients/cli/connections.c:11089 +msgid "'--order' argument is missing" +msgstr "" + +#: ../clients/cli/connections.c:11154 #, c-format msgid "Error: '%s' is not valid 'connection' command." msgstr "" #. define some prompts -#: ../cli/src/devices.c:70 +#: ../clients/cli/devices.c:35 msgid "Interface: " msgstr "" -#: ../clients/cli/devices.c:39 +#: ../clients/cli/devices.c:36 msgid "Interface(s): " msgstr "" #. 3 -#. 16 -#: ../cli/src/devices.c:78 ../cli/src/devices.c:106 +#. 20 +#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:76 msgid "CONNECTION" msgstr "ကွန်နက်ရှင်လိုင်း" #. 4 -#. 17 -#: ../cli/src/devices.c:79 ../cli/src/devices.c:107 +#. 21 +#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:77 msgid "CON-UUID" msgstr "" #. 2 -#: ../clients/cli/devices.c:61 +#: ../clients/cli/devices.c:58 msgid "NM-TYPE" msgstr "" -#. 2 -#: ../cli/src/devices.c:92 +#. 3 +#: ../clients/cli/devices.c:59 msgid "VENDOR" msgstr "" -#. 3 -#: ../cli/src/devices.c:93 +#. 4 +#: ../clients/cli/devices.c:60 msgid "PRODUCT" msgstr "ထုတ်ကုန်" -#. 4 -#: ../cli/src/devices.c:94 +#. 5 +#: ../clients/cli/devices.c:61 msgid "DRIVER" msgstr "DRIVER" -#. 5 -#: ../cli/src/devices.c:95 +#. 6 +#: ../clients/cli/devices.c:62 msgid "DRIVER-VERSION" msgstr "" -#. 6 -#: ../cli/src/devices.c:96 +#. 7 +#: ../clients/cli/devices.c:63 msgid "FIRMWARE-VERSION" msgstr "" -#. 7 -#: ../cli/src/devices.c:97 +#. 8 +#: ../clients/cli/devices.c:64 msgid "HWADDR" msgstr "HWADDR" -#. 8 -#: ../cli/src/devices.c:98 ../tui/nmt-page-ethernet.c:86 -#: ../tui/nmt-page-infiniband.c:96 ../tui/nmt-page-vlan.c:138 -#: ../tui/nmt-page-wifi.c:364 +#. 9 +#: ../clients/cli/devices.c:65 ../clients/tui/nmt-page-ethernet.c:83 +#: ../clients/tui/nmt-page-infiniband.c:94 ../clients/tui/nmt-page-vlan.c:128 +#: ../clients/tui/nmt-page-wifi.c:370 msgid "MTU" msgstr "" -#. 10 -#: ../cli/src/devices.c:100 +#. 11 +#: ../clients/cli/devices.c:67 msgid "REASON" msgstr "အကြောင်းပြချက်" -#. 11 -#: ../cli/src/devices.c:101 +#. 12 +#: ../clients/cli/devices.c:68 msgid "UDI" msgstr "UDI" -#. 12 -#: ../cli/src/devices.c:102 +#. 13 +#: ../clients/cli/devices.c:69 msgid "IP-IFACE" msgstr "IP-IFACE" #. 14 #. 2 -#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:103 +#: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102 msgid "IS-SOFTWARE" msgstr "" -#. 13 -#: ../cli/src/devices.c:103 +#. 15 +#: ../clients/cli/devices.c:71 msgid "NM-MANAGED" msgstr "NM-MANAGED" -#. 15 -#: ../cli/src/devices.c:105 +#. 17 +#: ../clients/cli/devices.c:73 msgid "FIRMWARE-MISSING" msgstr "FIRMWARE-ပျောက်နေပါသည်။" #. 18 -#: ../clients/cli/devices.c:77 +#: ../clients/cli/devices.c:74 +msgid "NM-PLUGIN-MISSING" +msgstr "" + +#. 19 +#: ../clients/cli/devices.c:75 msgid "PHYS-PORT-ID" msgstr "" +#. 23 +#: ../clients/cli/devices.c:79 +msgid "METERED" +msgstr "" + #. 0 -#: ../cli/src/devices.c:118 +#: ../clients/cli/devices.c:90 msgid "AVAILABLE-CONNECTION-PATHS" msgstr "" #. 1 -#: ../cli/src/devices.c:119 +#: ../clients/cli/devices.c:91 msgid "AVAILABLE-CONNECTIONS" msgstr "" #. 0 -#: ../cli/src/devices.c:128 +#: ../clients/cli/devices.c:100 msgid "CARRIER-DETECT" msgstr "CARRIER-DETECT" #. 1 -#: ../cli/src/devices.c:129 +#: ../clients/cli/devices.c:101 msgid "SPEED" msgstr "အမြန်နှုန်း" #. 0 -#: ../cli/src/devices.c:138 +#: ../clients/cli/devices.c:111 msgid "CARRIER" msgstr "" +#. 1 +#: ../clients/cli/devices.c:112 +msgid "S390-SUBCHANNELS" +msgstr "" + #. 0 -#: ../cli/src/devices.c:147 ../cli/src/devices.c:568 +#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:148 +#: ../clients/cli/devices.c:122 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:149 ../cli/src/devices.c:576 +#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:150 +#: ../clients/cli/devices.c:124 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:151 +#: ../clients/cli/devices.c:125 msgid "CCMP" msgstr "CCMP" #. 5 #. 2 -#: ../cli/src/devices.c:152 ../cli/src/devices.c:242 +#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228 msgid "AP" msgstr "AP" #. 6 -#: ../cli/src/devices.c:153 +#: ../clients/cli/devices.c:127 msgid "ADHOC" msgstr "" @@ -2880,104 +3449,104 @@ msgstr "" #. 0 -#: ../cli/src/devices.c:162 +#: ../clients/cli/devices.c:138 msgid "CTR-FREQ" msgstr "CTR-FREQ" #. 1 -#: ../cli/src/devices.c:163 +#: ../clients/cli/devices.c:139 msgid "RSSI" msgstr "RSSI" #. 2 -#: ../cli/src/devices.c:164 +#: ../clients/cli/devices.c:140 msgid "CINR" msgstr "CINR" #. 3 -#: ../cli/src/devices.c:165 +#: ../clients/cli/devices.c:141 msgid "TX-POW" msgstr "TX-POW" #. 4 -#: ../cli/src/devices.c:166 +#: ../clients/cli/devices.c:142 msgid "BSID" msgstr "BSID" #. 0 -#: ../cli/src/devices.c:175 ../tui/nmt-page-wifi.c:221 +#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:176 +#: ../clients/cli/devices.c:152 msgid "SSID-HEX" msgstr "" #. 2 -#: ../cli/src/devices.c:177 ../tui/nmt-page-wifi.c:352 +#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:358 msgid "BSSID" msgstr "BSSID" #. 3 -#: ../cli/src/devices.c:178 +#: ../clients/cli/devices.c:154 msgid "MODE" msgstr "MODE" #. 4 -#: ../cli/src/devices.c:179 +#: ../clients/cli/devices.c:155 msgid "CHAN" msgstr "" #. 5 -#: ../cli/src/devices.c:180 +#: ../clients/cli/devices.c:156 msgid "FREQ" msgstr "FREQ" #. 6 -#: ../cli/src/devices.c:181 +#: ../clients/cli/devices.c:157 msgid "RATE" msgstr "" #. 7 #. 1 -#: ../cli/src/devices.c:182 ../cli/src/devices.c:202 +#: ../clients/cli/devices.c:158 ../clients/cli/devices.c:178 msgid "SIGNAL" msgstr "SIGNAL" #. 8 -#: ../cli/src/devices.c:183 +#: ../clients/cli/devices.c:159 msgid "BARS" msgstr "" #. 9 -#: ../cli/src/devices.c:184 +#: ../clients/cli/devices.c:160 msgid "SECURITY" msgstr "လုံခြုံရေး" #. 10 -#: ../cli/src/devices.c:185 +#: ../clients/cli/devices.c:161 msgid "WPA-FLAGS" msgstr "WPA-FLAGS" #. 11 -#: ../cli/src/devices.c:186 +#: ../clients/cli/devices.c:162 msgid "RSN-FLAGS" msgstr "RSN-FLAGS" #. 14 -#: ../cli/src/devices.c:189 +#: ../clients/cli/devices.c:165 msgid "*" msgstr "" #. 0 #. 5 -#: ../cli/src/devices.c:201 ../cli/src/devices.c:245 +#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231 msgid "NSP" msgstr "NSP" #. 0 -#: ../cli/src/devices.c:216 +#: ../clients/cli/devices.c:192 msgid "SLAVES" msgstr "" @@ -2986,41 +3555,43 @@ msgid "PARENT" msgstr "" -#. 0 -#: ../cli/src/devices.c:225 +#. 1 +#: ../clients/cli/devices.c:202 msgid "ID" msgstr "" #. 0 -#: ../cli/src/devices.c:240 +#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226 msgid "CAPABILITIES" msgstr "CAPABILITIES" #. 1 -#: ../cli/src/devices.c:241 +#: ../clients/cli/devices.c:227 msgid "WIFI-PROPERTIES" msgstr "WIFI-PROPERTIES" #. 3 -#: ../cli/src/devices.c:243 +#: ../clients/cli/devices.c:229 msgid "WIRED-PROPERTIES" msgstr "WIRED-PROPERTIES" #. 4 -#: ../cli/src/devices.c:244 +#: ../clients/cli/devices.c:230 msgid "WIMAX-PROPERTIES" msgstr "WIMAX-PROPERTIES" #. 10 -#: ../cli/src/devices.c:250 ../tui/nmt-page-bond.c:73 +#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351 msgid "BOND" msgstr "" -#: ../tui/nmt-page-team.c:51 +#. 11 +#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145 msgid "TEAM" msgstr "" -#: ../tui/nmt-page-bridge.c:42 +#. 12 +#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74 msgid "BRIDGE" msgstr "" @@ -3029,43 +3600,122 @@ msgid "BLUETOOTH" msgstr "" -#. 12 -#: ../cli/src/devices.c:252 +#. 15 +#: ../clients/cli/devices.c:241 msgid "CONNECTIONS" msgstr "" +#. 1 +#: ../clients/cli/devices.c:253 +msgid "CHASSIS-ID" +msgstr "" + +#. 2 +#: ../clients/cli/devices.c:254 +msgid "PORT-ID" +msgstr "" + +#. 3 +#: ../clients/cli/devices.c:255 +msgid "PORT-DESCRIPTION" +msgstr "" + +#. 4 +#: ../clients/cli/devices.c:256 +msgid "SYSTEM-NAME" +msgstr "" + +#. 5 +#: ../clients/cli/devices.c:257 +msgid "SYSTEM-DESCRIPTION" +msgstr "" + +#. 6 +#: ../clients/cli/devices.c:258 +msgid "SYSTEM-CAPABILITIES" +msgstr "" + +#. 7 +#: ../clients/cli/devices.c:259 +msgid "IEEE-802-1-PVID" +msgstr "" + +#. 8 +#: ../clients/cli/devices.c:260 +msgid "IEEE-802-1-PPVID" +msgstr "" + +#. 9 +#: ../clients/cli/devices.c:261 +msgid "IEEE-802-1-PPVID-FLAGS" +msgstr "" + +#. 10 +#: ../clients/cli/devices.c:262 +msgid "IEEE-802-1-VID" +msgstr "" + +#. 11 +#: ../clients/cli/devices.c:263 +msgid "IEEE-802-1-VLAN-NAME" +msgstr "" + +#. 12 +#: ../clients/cli/devices.c:264 +msgid "DESTINATION" +msgstr "" + +#. 13 #: ../clients/cli/devices.c:265 +msgid "CHASSIS-ID-TYPE" +msgstr "" + +#. 14 +#: ../clients/cli/devices.c:266 +msgid "PORT-ID-TYPE" +msgstr "" + +#: ../clients/cli/devices.c:283 #, c-format msgid "" "Usage: nmcli device { COMMAND | help }\n" "\n" -"COMMAND := { status | show | connect | disconnect | delete | wifi | wimax }\n" -"\n" -"COMMAND := { status | show | connect | disconnect | delete | wifi }\n" +"COMMAND := { status | show | connect | reapply | disconnect | delete | " +"monitor | wifi | lldp }\n" "\n" " status\n" "\n" " show [<ifname>]\n" "\n" +" set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n" +"\n" " connect <ifname>\n" "\n" +" reapply <ifname> ...\n" +"\n" " disconnect <ifname> ...\n" "\n" " delete <ifname> ...\n" "\n" +" monitor <ifname> ...\n" +"\n" " wifi [list [ifname <ifname>] [bssid <BSSID>]]\n" "\n" " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] " "[ifname <ifname>]\n" -" [bssid <BSSID>] [name <name>] [private yes|no]\n" +" [bssid <BSSID>] [name <name>] [private yes|no] " +"[hidden yes|no]\n" +"\n" +" wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] " +"[channel <channel>] [password <password>]\n" "\n" -" wifi rescan [[ifname] <ifname>]\n" +" wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n" "\n" -" wimax [list [ifname <ifname>] [nsp <name>]]\n" +" lldp [list [ifname <ifname>]]\n" "\n" msgstr "" -#: ../cli/src/devices.c:301 +#: ../clients/cli/devices.c:305 #, c-format msgid "" "Usage: nmcli device status { help }\n" @@ -3083,7 +3733,7 @@ "\n" msgstr "" -#: ../cli/src/devices.c:317 +#: ../clients/cli/devices.c:320 #, c-format msgid "" "Usage: nmcli device show { ARGUMENTS | help }\n" @@ -3095,7 +3745,7 @@ "\n" msgstr "" -#: ../cli/src/devices.c:329 +#: ../clients/cli/devices.c:331 #, c-format msgid "" "Usage: nmcli device connect { ARGUMENTS | help }\n" @@ -3109,7 +3759,19 @@ "\n" msgstr "" -#: ../clients/cli/devices.c:327 +#: ../clients/cli/devices.c:343 +#, c-format +msgid "" +"Usage: nmcli device reapply { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := <ifname> ...\n" +"\n" +"Attempts to update device with changes to the currently active connection\n" +"made since it was last applied.\n" +"\n" +msgstr "" + +#: ../clients/cli/devices.c:354 #, c-format msgid "" "Usage: nmcli device disconnect { ARGUMENTS | help }\n" @@ -3122,7 +3784,7 @@ "\n" msgstr "" -#: ../clients/cli/devices.c:339 +#: ../clients/cli/devices.c:366 #, c-format msgid "" "Usage: nmcli device delete { ARGUMENTS | help }\n" @@ -3136,7 +3798,34 @@ "\n" msgstr "" -#: ../cli/src/devices.c:355 +#: ../clients/cli/devices.c:379 +#, c-format +msgid "" +"Usage: nmcli device set { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n" +"DEVICE := [ifname] <ifname> \n" +"PROPERTY := { autoconnect { yes | no } |\n" +" { managed { yes | no }\n" +"\n" +"Modify device properties.\n" +"\n" +msgstr "" + +#: ../clients/cli/devices.c:392 +#, c-format +msgid "" +"Usage: nmcli device monitor { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [<ifname>] ...\n" +"\n" +"Monitor device activity.\n" +"This command prints a line whenever the specified devices change state.\n" +"Monitors all devices in case no interface is specified.\n" +"\n" +msgstr "" + +#: ../clients/cli/devices.c:404 #, c-format msgid "" "Usage: nmcli device wifi { ARGUMENTS | help }\n" @@ -3150,7 +3839,8 @@ "\n" "ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type " "key|phrase] [ifname <ifname>]\n" -" [bssid <BSSID>] [name <name>] [private yes|no]\n" +" [bssid <BSSID>] [name <name>] [private yes|no] [hidden " +"yes|no]\n" "\n" "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n" "a new connection and then activates it on a device. This is a command-line\n" @@ -3161,432 +3851,543 @@ "only open, WEP and WPA-PSK networks are supported at the moment. It is also\n" "assumed that IP configuration is obtained via DHCP.\n" "\n" -"ARGUMENTS := rescan [[ifname] <ifname>]\n" +"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n" +" [band a|bg] [channel <channel>] [password " +"<password>]\n" +"\n" +"Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n" +"to stop the hotspot.\n" +"Parameters of the hotspot can be influenced by the optional parameters:\n" +"ifname - Wi-Fi device to use\n" +"con-name - name of the created hotspot connection profile\n" +"ssid - SSID of the hotspot\n" +"band - Wi-Fi band to use\n" +"channel - Wi-Fi channel to use\n" +"password - password to use for the hotspot\n" +"\n" +"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n" "\n" "Request that NetworkManager immediately re-scan for available access " "points.\n" "NetworkManager scans Wi-Fi networks periodically, but in some cases it " "might\n" -"be useful to start scanning manually. Note that this command does not show\n" -"the APs, use 'nmcli device wifi list' for that.\n" +"be useful to start scanning manually. 'ssid' allows scanning for a specific\n" +"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can " +"be\n" +"given. Note that this command does not show the APs,\n" +"use 'nmcli device wifi list' for that.\n" "\n" msgstr "" -#: ../cli/src/devices.c:389 +#: ../clients/cli/devices.c:451 #, c-format msgid "" -"Usage: nmcli device wimax { ARGUMENTS | help }\n" -"\n" -"Perform operation on WiMAX devices.\n" +"Usage: nmcli device lldp { ARGUMENTS | help }\n" "\n" -"ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n" +"ARGUMENTS := [list [ifname <ifname>]]\n" "\n" -"List available WiMAX NSPs. The 'ifname' and 'nsp' options can be used to\n" -"list networks for a particular interface, or with a specific NSP.\n" +"List neighboring devices discovered through LLDP. The 'ifname' option can " +"be\n" +"used to list neighbors for a particular interface.\n" "\n" msgstr "" -#: ../cli/src/devices.c:483 +#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676 +#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879 +#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110 +#, c-format +msgid "Error: No interface specified." +msgstr "" + +#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899 +#, c-format +msgid "Warning: argument '%s' is duplicated.\n" +msgstr "" + +#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901 +#, c-format +msgid "Error: Device '%s' not found.\n" +msgstr "" + +#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902 +#, c-format +msgid "Error: not all devices found." +msgstr "" + +#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801 msgid "(none)" msgstr "(ဘာမျှမရှိ)" -#: ../cli/src/devices.c:552 +#: ../clients/cli/devices.c:719 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../cli/src/devices.c:553 +#: ../clients/cli/devices.c:720 #, c-format msgid "%u Mbit/s" msgstr "" -#: ../cli/src/devices.c:572 +#: ../clients/cli/devices.c:735 msgid "WPA1" msgstr "" -#: ../cli/src/devices.c:581 +#: ../clients/cli/devices.c:744 msgid "802.1X" msgstr "" -#: ../cli/src/devices.c:597 +#: ../clients/cli/devices.c:760 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:598 +#: ../clients/cli/devices.c:761 msgid "Infra" msgstr "" -#: ../cli/src/connections.c:884 ../cli/src/connections.c:894 -#: ../cli/src/devices.c:599 +#: ../clients/cli/devices.c:762 msgid "N/A" msgstr "" -#: ../cli/src/devices.c:630 -msgid "Home" -msgstr "ပင်မ" - -#: ../cli/src/devices.c:633 -msgid "Partner" -msgstr "Partner" - -#: ../cli/src/devices.c:636 -msgid "Roaming" -msgstr "Roaming" - -#: ../cli/src/devices.c:730 +#: ../clients/cli/devices.c:916 msgid "Device details" msgstr "ကိရိယာအချက်အလက်" -#: ../cli/src/devices.c:742 +#: ../clients/cli/devices.c:928 #, c-format msgid "Error: 'device show': %s" msgstr "" -#: ../cli/src/devices.c:792 ../cli/src/devices.c:795 ../cli/src/devices.c:1342 -#: ../cli/src/devices.c:1484 +#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983 msgid "(unknown)" msgstr "(အမည်မသိ)" -#: ../cli/src/devices.c:832 +#: ../clients/cli/devices.c:1024 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" -#: ../cli/src/devices.c:918 +#: ../clients/cli/devices.c:1115 msgid "on" msgstr "ဖွင့်" -#: ../cli/src/devices.c:918 +#: ../clients/cli/devices.c:1115 msgid "off" msgstr "ပိတ်" -#: ../cli/src/devices.c:1193 +#: ../clients/cli/devices.c:1342 #, c-format msgid "Error: 'device status': %s" msgstr "" #. Add headers -#: ../cli/src/devices.c:1211 +#: ../clients/cli/devices.c:1349 msgid "Status of devices" msgstr "ကိရိယာများ၏အခြေအနေ" -#: ../cli/src/devices.c:1242 +#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509 #, c-format msgid "Error: invalid extra argument '%s'." msgstr "" -#: ../cli/src/devices.c:1270 ../cli/src/devices.c:1432 -#: ../cli/src/devices.c:1566 ../cli/src/devices.c:1705 -#: ../cli/src/devices.c:2461 +#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707 +#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396 +#: ../clients/cli/devices.c:3548 #, c-format msgid "Error: Device '%s' not found." msgstr "အမှားအယွင်း - '%s' ကိရိယာကိုမတွေ့ပါ။" -#: ../cli/src/devices.c:1325 +#: ../clients/cli/devices.c:1475 #, c-format msgid "Device '%s' successfully activated with '%s'.\n" msgstr "" -#: ../clients/cli/devices.c:1389 +#: ../clients/cli/devices.c:1481 #, c-format msgid "Error: Connection activation failed: (%d) %s.\n" msgstr "" -#: ../clients/cli/devices.c:1423 +#: ../clients/cli/devices.c:1517 +#, c-format +msgid "Error: Failed to setup a Wi-Fi hotspot: %s" +msgstr "" + +#: ../clients/cli/devices.c:1520 #, c-format msgid "Error: Failed to add/activate new connection: %s" msgstr "" -#: ../cli/src/devices.c:1883 +#: ../clients/cli/devices.c:1530 +#, c-format +msgid "Error: Failed to setup a Wi-Fi hotspot" +msgstr "" + +#: ../clients/cli/devices.c:1532 #, c-format msgid "Error: Failed to add/activate new connection: Unknown error" msgstr "" -#: ../cli/src/devices.c:1846 ../cli/src/devices.c:1893 +#: ../clients/cli/devices.c:1544 #, c-format msgid "Connection with UUID '%s' created and activated on device '%s'\n" msgstr "" -#: ../cli/src/devices.c:1341 +#: ../clients/cli/devices.c:1547 #, c-format -msgid "Error: Device activation failed: %s" +msgid "Hotspot '%s' activated on device '%s'\n" msgstr "" -#: ../cli/src/devices.c:1349 +#: ../clients/cli/devices.c:1611 #, c-format -msgid "Error: Device activation failed: device was disconnected" +msgid "Error: Device activation failed: %s" msgstr "" -#: ../cli/src/devices.c:1362 +#: ../clients/cli/devices.c:1620 #, c-format -msgid "Device '%s' has been connected.\n" +msgid "Error: Device activation failed: device was disconnected" msgstr "" -#: ../cli/src/devices.c:1391 ../cli/src/devices.c:1400 -#: ../cli/src/devices.c:1525 ../cli/src/devices.c:1534 +#: ../clients/cli/devices.c:1635 #, c-format -msgid "Error: No interface specified." +msgid "Device '%s' has been connected.\n" msgstr "" -#: ../cli/src/devices.c:1406 ../cli/src/devices.c:1540 +#: ../clients/cli/devices.c:1691 #, c-format msgid "Error: extra argument not allowed: '%s'." msgstr "" -#: ../clients/cli/devices.c:1671 ../clients/cli/devices.c:1686 -#: ../clients/cli/devices.c:1750 +#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791 +#: ../clients/cli/devices.c:1964 #, c-format msgid "Device '%s' successfully disconnected.\n" msgstr "" -#: ../clients/cli/devices.c:1674 +#: ../clients/cli/devices.c:1779 #, c-format msgid "Device '%s' successfully removed.\n" msgstr "" -#: ../clients/cli/devices.c:1734 +#: ../clients/cli/devices.c:1838 #, c-format -msgid "Error: not all devices disconnected." +msgid "Error: not all connections reapplied." msgstr "" -#: ../clients/cli/devices.c:1735 +#: ../clients/cli/devices.c:1839 #, c-format -msgid "Error: Device '%s' (%s) disconnecting failed: %s\n" +msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n" msgstr "" -#: ../clients/cli/devices.c:1802 ../clients/cli/devices.c:1924 +#: ../clients/cli/devices.c:1849 #, c-format -msgid "Warning: argument '%s' is duplicated.\n" +msgid "Connection successfully reapplied to device '%s'.\n" msgstr "" -#: ../clients/cli/devices.c:1804 ../clients/cli/devices.c:1926 +#: ../clients/cli/devices.c:1912 #, c-format -msgid "Error: Device '%s' not found.\n" +msgid "Error: no valid device provided." msgstr "" -#: ../clients/cli/devices.c:1805 ../clients/cli/devices.c:1927 +#: ../clients/cli/devices.c:1949 #, c-format -msgid "Error: not all devices found." +msgid "Error: not all devices disconnected." msgstr "" -#: ../clients/cli/devices.c:1815 ../clients/cli/devices.c:1937 +#: ../clients/cli/devices.c:1950 #, c-format -msgid "Error: no valid device provided." +msgid "Error: Device '%s' (%s) disconnecting failed: %s\n" msgstr "" -#: ../clients/cli/devices.c:1859 +#: ../clients/cli/devices.c:2025 #, c-format msgid "Error: not all devices deleted." msgstr "" -#: ../clients/cli/devices.c:1860 +#: ../clients/cli/devices.c:2026 #, c-format msgid "Error: Device '%s' (%s) deletion failed: %s\n" msgstr "" -#: ../clients/cli/devices.c:1918 +#: ../clients/cli/devices.c:2132 +#, c-format +msgid "Error: No property specified." +msgstr "" + +#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159 +#, c-format +msgid "Error: '%s' argument is missing." +msgstr "အမှားအယွင်း - '%s' argument ပျောက်နေပါသည်။" + +#: ../clients/cli/devices.c:2149 +#, c-format +msgid "Error: 'managed': %s." +msgstr "" + +#: ../clients/cli/devices.c:2174 +#, c-format +msgid "Error: property '%s' is not known." +msgstr "" + +#: ../clients/cli/devices.c:2220 +#, c-format +msgid "%s: using connection '%s'\n" +msgstr "" + +#: ../clients/cli/devices.c:2246 #, c-format -msgid "Error: Device '%s' is a hardware device. It can't be deleted.\n" +msgid "%s: device created\n" msgstr "" -#: ../clients/cli/devices.c:1920 +#: ../clients/cli/devices.c:2253 #, c-format -msgid "Error: not all devices valid." +msgid "%s: device removed\n" msgstr "" -#: ../cli/src/devices.c:1637 +#: ../clients/cli/devices.c:2339 msgid "Wi-Fi scan list" msgstr "" -#: ../cli/src/devices.c:1675 +#: ../clients/cli/devices.c:2377 #, c-format msgid "Error: 'device wifi': %s" msgstr "" -#: ../cli/src/devices.c:1728 ../cli/src/devices.c:1803 +#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "Error: Access point with bssid '%s' not found." -#: ../clients/cli/devices.c:2125 ../clients/cli/devices.c:2612 +#: ../clients/cli/devices.c:2446 #, c-format msgid "" "Error: Device '%s' was not recognized as a Wi-Fi device, check " "NetworkManager Wi-Fi plugin." msgstr "" -#: ../cli/src/devices.c:1752 ../cli/src/devices.c:2156 -#: ../cli/src/devices.c:2318 +#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780 +#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349 #, c-format msgid "Error: Device '%s' is not a Wi-Fi device." msgstr "" -#: ../cli/src/devices.c:2038 +#: ../clients/cli/devices.c:2660 msgid "SSID or BSSID: " msgstr "" -#: ../cli/src/devices.c:2043 +#: ../clients/cli/devices.c:2665 #, c-format msgid "Error: SSID or BSSID are missing." msgstr "" -#: ../cli/src/devices.c:2067 +#: ../clients/cli/devices.c:2689 #, c-format msgid "Error: bssid argument value '%s' is not a valid BSSID." msgstr "" -#: ../cli/src/devices.c:2091 +#: ../clients/cli/devices.c:2713 #, c-format msgid "" "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." msgstr "" -#: ../cli/src/devices.c:2111 +#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746 #, c-format msgid "Error: %s: %s." msgstr "" -#: ../cli/src/devices.c:2126 +#: ../clients/cli/devices.c:2761 #, c-format msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." msgstr "" -#: ../cli/src/devices.c:2132 +#: ../clients/cli/devices.c:2767 #, c-format msgid "Error: Parameter '%s' is neither SSID nor BSSID." msgstr "" -#: ../cli/src/devices.c:2158 ../cli/src/devices.c:2320 +#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202 +#: ../clients/cli/devices.c:3351 #, c-format msgid "Error: No Wi-Fi device found." msgstr "" -#: ../cli/src/devices.c:2176 +#: ../clients/cli/devices.c:2802 +#, c-format +msgid "Error: Failed to scan hidden SSID: %s." +msgstr "" + +#: ../clients/cli/devices.c:2827 #, c-format msgid "Error: No network with SSID '%s' found." msgstr "" -#: ../cli/src/devices.c:2178 +#: ../clients/cli/devices.c:2829 #, c-format msgid "Error: No access point with BSSID '%s' found." msgstr "" -#: ../cli/src/devices.c:2217 +#: ../clients/cli/devices.c:2871 +#, c-format +msgid "" +"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n" +msgstr "" + +#: ../clients/cli/devices.c:2885 msgid "Password: " msgstr "" -#: ../cli/src/devices.c:2346 +#: ../clients/cli/devices.c:3034 #, c-format -msgid "Error: 'device wifi' command '%s' is not valid." +msgid "'%s' is not valid WPA PSK" +msgstr "" + +#: ../clients/cli/devices.c:3051 +#, c-format +msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)" +msgstr "" + +#: ../clients/cli/devices.c:3067 +#, c-format +msgid "Hotspot password: %s\n" +msgstr "" + +#: ../clients/cli/devices.c:3125 +#, c-format +msgid "Error: ssid is too long." +msgstr "" + +#: ../clients/cli/devices.c:3137 +#, c-format +msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'." +msgstr "" + +#: ../clients/cli/devices.c:3161 +#, c-format +msgid "Error: Unknown parameter %s." +msgstr "" + +#: ../clients/cli/devices.c:3180 +#, c-format +msgid "Error: channel requires band too." +msgstr "" + +#: ../clients/cli/devices.c:3186 +#, c-format +msgid "Error: channel '%s' not valid for band '%s'." msgstr "" -#: ../cli/src/devices.c:2393 -msgid "WiMAX NSP list" -msgstr "WiMAX NSP list" +#: ../clients/cli/devices.c:3214 +#, c-format +msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode." +msgstr "" -#: ../cli/src/devices.c:2430 +#: ../clients/cli/devices.c:3249 #, c-format -msgid "Error: 'device wimax': %s" +msgid "Error: Invalid 'password': %s." msgstr "" -#: ../cli/src/devices.c:2484 +#: ../clients/cli/devices.c:3318 #, c-format -msgid "Error: NSP with name '%s' not found." -msgstr "Error: NSP with name '%s' not found." +msgid "Error: '%s' cannot repeat." +msgstr "" -#: ../cli/src/devices.c:2497 +#: ../clients/cli/devices.c:3399 #, c-format -msgid "Error: Device '%s' is not a WiMAX device." -msgstr "Error: Device '%s' is not a WiMAX device." +msgid "Error: 'device wifi' command '%s' is not valid." +msgstr "" + +#. Main header name +#: ../clients/cli/devices.c:3425 +msgid "Device LLDP neighbors" +msgstr "" -#: ../cli/src/devices.c:2541 +#: ../clients/cli/devices.c:3528 #, c-format -msgid "Error: Access point with nsp '%s' not found." -msgstr "Error: Access point with nsp '%s' not found." +msgid "Error: 'device lldp list': %s" +msgstr "" -#: ../cli/src/devices.c:2578 +#: ../clients/cli/devices.c:3575 #, c-format -msgid "Error: 'device wimax' command '%s' is not valid." +msgid "Error: 'device lldp' command '%s' is not valid." msgstr "" -#: ../cli/src/devices.c:2728 +#: ../clients/cli/devices.c:3770 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "" -#: ../cli/src/network-manager.c:37 +#: ../clients/cli/general.c:34 msgid "RUNNING" msgstr "" #. 0 -#: ../cli/src/network-manager.c:38 +#: ../clients/cli/general.c:35 msgid "VERSION" msgstr "" #. 2 -#: ../cli/src/network-manager.c:40 +#: ../clients/cli/general.c:37 msgid "STARTUP" msgstr "" #. 3 -#: ../cli/src/network-manager.c:41 +#: ../clients/cli/general.c:38 msgid "CONNECTIVITY" msgstr "" #. 4 -#: ../cli/src/network-manager.c:42 +#: ../clients/cli/general.c:39 msgid "NETWORKING" msgstr "" #. 5 -#: ../cli/src/network-manager.c:43 +#: ../clients/cli/general.c:40 msgid "WIFI-HW" msgstr "" #. 6 -#: ../cli/src/network-manager.c:44 +#: ../clients/cli/general.c:41 msgid "WIFI" msgstr "" #. 7 -#: ../cli/src/network-manager.c:45 +#: ../clients/cli/general.c:42 msgid "WWAN-HW" msgstr "" #. 8 -#: ../cli/src/network-manager.c:46 +#: ../clients/cli/general.c:43 msgid "WWAN" msgstr "" #. 9 -#: ../cli/src/network-manager.c:47 +#: ../clients/cli/general.c:44 msgid "WIMAX-HW" msgstr "" #. 10 -#: ../cli/src/network-manager.c:48 +#: ../clients/cli/general.c:45 msgid "WIMAX" msgstr "" -#: ../cli/src/network-manager.c:70 +#: ../clients/cli/general.c:61 msgid "PERMISSION" msgstr "" #. 0 -#: ../cli/src/network-manager.c:71 +#: ../clients/cli/general.c:62 msgid "VALUE" msgstr "" -#: ../cli/src/network-manager.c:79 +#: ../clients/cli/general.c:70 msgid "LEVEL" msgstr "" #. 0 -#: ../cli/src/network-manager.c:80 +#: ../clients/cli/general.c:71 msgid "DOMAINS" msgstr "" -#: ../cli/src/network-manager.c:95 +#: ../clients/cli/general.c:85 #, c-format msgid "" "Usage: nmcli general { COMMAND | help }\n" @@ -3603,7 +4404,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:107 +#: ../clients/cli/general.c:96 #, c-format msgid "" "Usage: nmcli general status { help }\n" @@ -3614,7 +4415,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:117 +#: ../clients/cli/general.c:105 #, c-format msgid "" "Usage: nmcli general hostname { ARGUMENTS | help }\n" @@ -3628,7 +4429,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:130 +#: ../clients/cli/general.c:117 #, c-format msgid "" "Usage: nmcli general permissions { help }\n" @@ -3637,7 +4438,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:139 +#: ../clients/cli/general.c:125 #, c-format msgid "" "Usage: nmcli general logging { ARGUMENTS | help }\n" @@ -3653,7 +4454,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:153 +#: ../clients/cli/general.c:138 #, c-format msgid "" "Usage: nmcli networking { COMMAND | help }\n" @@ -3668,7 +4469,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:164 +#: ../clients/cli/general.c:148 #, c-format msgid "" "Usage: nmcli networking on { help }\n" @@ -3677,7 +4478,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:173 +#: ../clients/cli/general.c:156 #, c-format msgid "" "Usage: nmcli networking off { help }\n" @@ -3686,7 +4487,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:182 +#: ../clients/cli/general.c:164 #, c-format msgid "" "Usage: nmcli networking connectivity { ARGUMENTS | help }\n" @@ -3699,22 +4500,18 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:195 +#: ../clients/cli/general.c:176 #, c-format msgid "" "Usage: nmcli radio { COMMAND | help }\n" "\n" -"COMMAND := { all | wifi | wwan | wimax }\n" -"\n" -" all | wifi | wwan | wimax [ on | off ]\n" -"\n" "COMMAND := { all | wifi | wwan }\n" "\n" " all | wifi | wwan [ on | off ]\n" "\n" msgstr "" -#: ../cli/src/network-manager.c:210 +#: ../clients/cli/general.c:185 #, c-format msgid "" "Usage: nmcli radio all { ARGUMENTS | help }\n" @@ -3725,7 +4522,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:221 +#: ../clients/cli/general.c:195 #, c-format msgid "" "Usage: nmcli radio wifi { ARGUMENTS | help }\n" @@ -3736,7 +4533,7 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:232 +#: ../clients/cli/general.c:205 #, c-format msgid "" "Usage: nmcli radio wwan { ARGUMENTS | help }\n" @@ -3747,174 +4544,208 @@ "\n" msgstr "" -#: ../cli/src/network-manager.c:244 +#: ../clients/cli/general.c:215 #, c-format msgid "" -"Usage: nmcli radio wimax { ARGUMENTS | help }\n" +"Usage: nmcli monitor\n" "\n" -"ARGUMENTS := [on | off]\n" -"\n" -"Get status of WiMAX radio switch, or turn it on/off.\n" +"Monitor NetworkManager changes.\n" +"Prints a line whenever a change occurs in NetworkManager\n" "\n" msgstr "" -#: ../cli/src/network-manager.c:264 +#: ../clients/cli/general.c:233 msgid "asleep" msgstr "" -#: ../cli/src/network-manager.c:266 +#: ../clients/cli/general.c:235 msgid "connecting" msgstr "" -#: ../cli/src/network-manager.c:268 +#: ../clients/cli/general.c:237 msgid "connected (local only)" msgstr "" -#: ../cli/src/network-manager.c:270 +#: ../clients/cli/general.c:239 msgid "connected (site only)" msgstr "" -#: ../cli/src/network-manager.c:274 +#: ../clients/cli/general.c:243 msgid "disconnecting" msgstr "" -#: ../cli/src/network-manager.c:290 +#: ../clients/cli/general.c:279 msgid "portal" msgstr "" -#: ../cli/src/network-manager.c:292 +#: ../clients/cli/general.c:281 msgid "limited" msgstr "" -#: ../cli/src/network-manager.c:294 +#: ../clients/cli/general.c:283 msgid "full" msgstr "" -#: ../cli/src/network-manager.c:332 +#: ../clients/cli/general.c:334 #, c-format msgid "Error: only these fields are allowed: %s" msgstr "" -#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349 -#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351 -#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354 -#: ../cli/src/network-manager.c:355 -msgid "enabled" -msgstr "" - -#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349 -#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351 -#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354 -#: ../cli/src/network-manager.c:355 -msgid "disabled" -msgstr "" - -#: ../cli/src/network-manager.c:367 +#: ../clients/cli/general.c:360 msgid "NetworkManager status" msgstr "" -#: ../cli/src/network-manager.c:372 +#: ../clients/cli/general.c:365 msgid "running" msgstr "" -#: ../cli/src/network-manager.c:375 +#: ../clients/cli/general.c:368 msgid "starting" msgstr "" -#: ../cli/src/network-manager.c:375 +#: ../clients/cli/general.c:368 msgid "started" msgstr "" -#: ../cli/src/network-manager.c:446 +#: ../clients/cli/general.c:370 ../clients/cli/general.c:371 +#: ../clients/cli/general.c:372 ../clients/cli/general.c:373 +#: ../clients/cli/general.c:374 +msgid "enabled" +msgstr "" + +#: ../clients/cli/general.c:370 ../clients/cli/general.c:371 +#: ../clients/cli/general.c:372 ../clients/cli/general.c:373 +#: ../clients/cli/general.c:374 +msgid "disabled" +msgstr "" + +#: ../clients/cli/general.c:446 msgid "auth" msgstr "" -#: ../cli/src/network-manager.c:475 +#: ../clients/cli/general.c:475 #, c-format msgid "Error: 'general permissions': %s" msgstr "" -#: ../cli/src/network-manager.c:489 +#: ../clients/cli/general.c:489 msgid "NetworkManager permissions" msgstr "" -#: ../cli/src/network-manager.c:530 +#: ../clients/cli/general.c:530 #, c-format msgid "Error: 'general logging': %s" msgstr "" -#: ../cli/src/network-manager.c:545 +#: ../clients/cli/general.c:545 msgid "NetworkManager logging" msgstr "" -#: ../clients/cli/general.c:546 +#: ../clients/cli/general.c:567 #, c-format msgid "Error: failed to set hostname: %s" msgstr "" -#: ../clients/cli/general.c:659 +#: ../clients/cli/general.c:680 #, c-format msgid "Error: failed to set logging: %s" msgstr "" -#: ../cli/src/network-manager.c:692 +#: ../clients/cli/general.c:689 #, c-format msgid "Error: 'general' command '%s' is not valid." msgstr "" -#: ../cli/src/network-manager.c:710 +#: ../clients/cli/general.c:707 #, c-format msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)" msgstr "" -#: ../cli/src/network-manager.c:735 +#: ../clients/cli/general.c:732 #, c-format msgid "Error: invalid '%s' argument: '%s' (use on/off)." msgstr "" -#: ../cli/src/network-manager.c:746 +#: ../clients/cli/general.c:743 msgid "Connectivity" msgstr "" -#: ../cli/src/network-manager.c:758 +#: ../clients/cli/general.c:758 msgid "Networking" msgstr "" -#: ../cli/src/network-manager.c:783 +#: ../clients/cli/general.c:783 #, c-format msgid "Error: 'networking connectivity' command '%s' is not valid." msgstr "" -#: ../cli/src/network-manager.c:799 +#: ../clients/cli/general.c:799 #, c-format msgid "Error: 'networking' command '%s' is not valid." msgstr "" -#: ../cli/src/network-manager.c:825 ../cli/src/network-manager.c:845 +#: ../clients/cli/general.c:828 ../clients/cli/general.c:848 msgid "Radio switches" msgstr "" #. no argument, show current WiFi state -#: ../cli/src/network-manager.c:863 +#: ../clients/cli/general.c:866 msgid "Wi-Fi radio switch" msgstr "" #. no argument, show current WWAN (mobile broadband) state -#: ../cli/src/network-manager.c:879 +#: ../clients/cli/general.c:882 msgid "WWAN radio switch" msgstr "" -#. no argument, show current WiMAX state -#: ../cli/src/network-manager.c:896 -msgid "WiMAX radio switch" +#: ../clients/cli/general.c:893 +#, c-format +msgid "Error: 'radio' command '%s' is not valid." +msgstr "" + +#: ../clients/cli/general.c:914 +msgid "NetworkManager has started" +msgstr "" + +#: ../clients/cli/general.c:917 +msgid "NetworkManager has stopped" msgstr "" -#: ../cli/src/network-manager.c:908 +#: ../clients/cli/general.c:931 #, c-format -msgid "Error: 'radio' command '%s' is not valid." +msgid "Hostname set to '%s'\n" +msgstr "" + +#: ../clients/cli/general.c:946 +#, c-format +msgid "'%s' is now the primary connection\n" +msgstr "" + +#: ../clients/cli/general.c:948 +#, c-format +msgid "There's no primary connection\n" +msgstr "" + +#: ../clients/cli/general.c:960 +#, c-format +msgid "Connectivity is now '%s'\n" +msgstr "" + +#: ../clients/cli/general.c:973 +#, c-format +msgid "Networkmanager is now in the '%s' state\n" +msgstr "" + +#: ../clients/cli/general.c:984 +#, c-format +msgid "Error: 'monitor' command '%s' is not valid." msgstr "" -#: ../clients/cli/nmcli.c:86 +#: ../clients/cli/general.c:998 +msgid "Networkmanager is not running (waiting for it)\n" +msgstr "" + +#: ../clients/cli/nmcli.c:83 #, c-format msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" @@ -3923,12 +4754,15 @@ " -t[erse] terse output\n" " -p[retty] pretty output\n" " -m[ode] tabular|multiline output mode\n" +" -c[olors] auto|yes|no whether to use colors in " +"output\n" " -f[ields] <field1,field2,...>|all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" " -n[ocheck] don't check nmcli and " "NetworkManager versions\n" " -a[sk] ask for missing parameters\n" +" -s[how-secrets] allow displaying passwords\n" " -w[ait] <seconds> set timeout waiting for " "finishing operations\n" " -v[ersion] show program version\n" @@ -3941,338 +4775,390 @@ " c[onnection] NetworkManager's connections\n" " d[evice] devices managed by NetworkManager\n" " a[gent] NetworkManager secret agent or polkit agent\n" +" m[onitor] monitor NetworkManager changes\n" "\n" msgstr "" -#: ../cli/src/nmcli.c:137 +#: ../clients/cli/nmcli.c:143 #, c-format msgid "Error: Object '%s' is unknown, try 'nmcli help'." msgstr "" -#: ../cli/src/nmcli.c:167 +#: ../clients/cli/nmcli.c:173 #, c-format msgid "Error: Option '--terse' is specified the second time." msgstr "" -#: ../cli/src/nmcli.c:172 +#: ../clients/cli/nmcli.c:178 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." msgstr "" -#: ../cli/src/nmcli.c:180 +#: ../clients/cli/nmcli.c:186 #, c-format msgid "Error: Option '--pretty' is specified the second time." msgstr "" -#: ../cli/src/nmcli.c:185 +#: ../clients/cli/nmcli.c:191 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." msgstr "" -#: ../cli/src/nmcli.c:195 ../cli/src/nmcli.c:211 ../cli/src/nmcli.c:240 +#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217 +#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266 #, c-format msgid "Error: missing argument for '%s' option." msgstr "" -#: ../cli/src/nmcli.c:204 ../cli/src/nmcli.c:220 +#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228 +#: ../clients/cli/nmcli.c:244 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." msgstr "" -#: ../cli/src/nmcli.c:227 +#: ../clients/cli/nmcli.c:251 #, c-format msgid "Error: fields for '%s' options are missing." msgstr "" -#: ../cli/src/nmcli.c:245 +#: ../clients/cli/nmcli.c:271 #, c-format msgid "Error: '%s' is not a valid timeout for '%s' option." msgstr "" -#: ../cli/src/nmcli.c:252 +#: ../clients/cli/nmcli.c:278 #, c-format msgid "nmcli tool, version %s\n" msgstr "" -#: ../cli/src/nmcli.c:258 +#: ../clients/cli/nmcli.c:284 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." msgstr "" -#: ../clients/cli/nmcli.c:346 ../clients/cli/nmcli.c:356 +#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377 #, c-format msgid "" "\n" "Error: nmcli terminated by signal %s (%d)\n" msgstr "" -#: ../clients/cli/nmcli.c:387 +#: ../clients/cli/nmcli.c:408 #, c-format msgid "Failed to set signal mask: %d\n" msgstr "" -#: ../clients/cli/nmcli.c:394 +#: ../clients/cli/nmcli.c:415 #, c-format msgid "Failed to create signal handling thread: %d\n" msgstr "" -#: ../clients/cli/nmcli.c:491 ../clients/nm-online.c:197 +#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193 #, c-format msgid "Error: Could not create NMClient object: %s." msgstr "" -#: ../cli/src/nmcli.c:359 +#: ../clients/cli/nmcli.c:529 msgid "Success" msgstr "" -#: ../clients/cli/polkit-agent.c:82 +#: ../clients/cli/polkit-agent.c:66 #, c-format msgid "Authentication message: %s\n" msgstr "" -#: ../clients/cli/polkit-agent.c:88 +#: ../clients/cli/polkit-agent.c:72 #, c-format msgid "Authentication error: %s\n" msgstr "" -#: ../clients/cli/polkit-agent.c:134 +#: ../clients/cli/polkit-agent.c:118 #, c-format msgid "Warning: polkit agent initialization failed: %s\n" msgstr "" -#: ../cli/src/settings.c:670 +#: ../clients/cli/settings.c:790 #, c-format msgid "%d (key)" msgstr "" -#: ../cli/src/settings.c:672 +#: ../clients/cli/settings.c:792 #, c-format msgid "%d (passphrase)" msgstr "" -#: ../cli/src/settings.c:675 ../cli/src/settings.c:803 +#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881 #, c-format msgid "%d (unknown)" msgstr "" -#: ../cli/src/settings.c:751 +#: ../clients/cli/settings.c:824 msgid "0 (NONE)" msgstr "" -#: ../cli/src/settings.c:757 +#: ../clients/cli/settings.c:830 msgid "REORDER_HEADERS, " msgstr "" -#: ../cli/src/settings.c:759 +#: ../clients/cli/settings.c:832 msgid "GVRP, " msgstr "" -#: ../cli/src/settings.c:761 +#: ../clients/cli/settings.c:834 msgid "LOOSE_BINDING, " msgstr "" -#: ../cli/src/settings.c:797 +#: ../clients/cli/settings.c:836 +msgid "MVRP, " +msgstr "" + +#: ../clients/cli/settings.c:875 #, c-format msgid "%d (disabled)" msgstr "" -#: ../cli/src/settings.c:799 +#: ../clients/cli/settings.c:877 #, c-format msgid "%d (enabled, prefer public IP)" msgstr "" -#: ../cli/src/settings.c:801 +#: ../clients/cli/settings.c:879 #, c-format msgid "%d (enabled, prefer temporary IP)" msgstr "" -#: ../clients/cli/settings.c:781 +#: ../clients/cli/settings.c:894 #, c-format msgid "%d (no)" msgstr "" -#: ../clients/cli/settings.c:783 +#: ../clients/cli/settings.c:896 #, c-format msgid "%d (yes)" msgstr "" -#: ../clients/cli/settings.c:786 +#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554 #, c-format msgid "%d (default)" msgstr "" -#: ../cli/src/settings.c:813 +#: ../clients/cli/settings.c:912 msgid "0 (none)" msgstr "" -#: ../cli/src/settings.c:819 +#: ../clients/cli/settings.c:918 msgid "agent-owned, " msgstr "" -#: ../cli/src/settings.c:821 +#: ../clients/cli/settings.c:920 msgid "not saved, " msgstr "" -#: ../cli/src/settings.c:823 +#: ../clients/cli/settings.c:922 msgid "not required, " msgstr "" -#: ../cli/src/settings.c:1129 +#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84 +msgid "(default)" +msgstr "" + +#: ../clients/cli/settings.c:1252 msgid "0 (disabled)" msgstr "" -#: ../cli/src/settings.c:1135 +#: ../clients/cli/settings.c:1258 msgid "enabled, " msgstr "" -#: ../cli/src/settings.c:1137 +#: ../clients/cli/settings.c:1260 msgid "advertise, " msgstr "" -#: ../cli/src/settings.c:1139 +#: ../clients/cli/settings.c:1262 msgid "willing, " msgstr "" -#: ../cli/src/settings.c:1167 +#: ../clients/cli/settings.c:1290 msgid "-1 (unset)" msgstr "" -#: ../cli/src/settings.c:1275 ../cli/src/settings.c:1458 -#: ../cli/src/settings.c:1498 +#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724 +#: ../clients/cli/settings.c:1864 msgid "auto" msgstr "" -#: ../cli/src/settings.c:1288 +#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895 msgid "default" msgstr "" -#: ../cli/src/settings.c:1635 +#: ../clients/cli/settings.c:1556 +#, c-format +msgid "%d (off)" +msgstr "" + +#: ../clients/cli/settings.c:1770 +#, c-format +msgid "" +"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or " +"'none'" +msgstr "" + +#: ../clients/cli/settings.c:1781 +msgid "'default' and 'ignore' are incompatible with other flags" +msgstr "" + +#: ../clients/cli/settings.c:1817 +#, c-format +msgid "invalid mode '%s', use one of %s" +msgstr "" + +#: ../clients/cli/settings.c:1899 +#, c-format +msgid "always" +msgstr "" + +#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286 +#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981 +#: ../libnm-core/nm-keyfile-reader.c:573 +#, c-format +msgid "invalid option '%s', use one of [%s]" +msgstr "" + +#: ../clients/cli/settings.c:2116 #, c-format msgid "Do you also want to set '%s' to '%s'? [yes]: " msgstr "" -#: ../cli/src/settings.c:1637 +#: ../clients/cli/settings.c:2118 #, c-format msgid "Do you also want to clear '%s'? [yes]: " msgstr "" -#: ../cli/src/settings.c:1798 +#: ../clients/cli/settings.c:2279 #, c-format msgid "" "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n" msgstr "" -#: ../clients/cli/settings.c:1875 +#: ../clients/cli/settings.c:2298 #, c-format msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n" msgstr "" -#: ../clients/cli/settings.c:1877 +#: ../clients/cli/settings.c:2300 msgid "Do you want to remove them? [yes] " msgstr "" -#: ../cli/src/settings.c:1880 ../cli/src/settings.c:2160 -#: ../cli/src/settings.c:4263 +#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791 +#: ../clients/cli/settings.c:5182 #, c-format msgid "'%s' is not valid" msgstr "" -#: ../cli/src/settings.c:1903 +#: ../clients/cli/settings.c:2419 #, c-format msgid "'%d' is not valid; use <%d-%d>" msgstr "" -#: ../clients/cli/settings.c:2018 +#: ../clients/cli/settings.c:2441 #, c-format msgid "'%lld' is not valid; use <%lld-%lld>" msgstr "" -#: ../clients/cli/settings.c:2040 +#: ../clients/cli/settings.c:2463 #, c-format msgid "'%u' is not valid; use <%u-%u>" msgstr "" -#: ../cli/src/settings.c:1991 +#: ../clients/cli/settings.c:2502 +#, c-format +msgid "'%u' flags are not valid; use combination of %s" +msgstr "" + +#: ../clients/cli/settings.c:2569 #, c-format msgid "'%s' is not valid; use <option>=<value>" msgstr "" -#: ../cli/src/settings.c:2025 +#: ../clients/cli/settings.c:2603 #, c-format msgid "index '%s' is not valid" msgstr "" -#: ../cli/src/settings.c:2030 ../cli/src/settings.c:2055 +#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633 msgid "no item to remove" msgstr "" -#: ../cli/src/settings.c:2034 ../cli/src/settings.c:2059 +#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637 #, c-format msgid "index '%d' is not in range <0-%d>" msgstr "" -#: ../cli/src/settings.c:2074 +#: ../clients/cli/settings.c:2652 #, c-format msgid "invalid option '%s'" msgstr "" -#: ../cli/src/settings.c:2076 +#: ../clients/cli/settings.c:2654 msgid "missing option" msgstr "" -#: ../cli/src/settings.c:2106 ../cli/src/settings.c:2126 +#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701 +#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741 #, c-format msgid "'%s' is not a valid number (or out of range)" msgstr "" -#: ../clients/cli/settings.c:2292 +#: ../clients/cli/settings.c:2775 #, c-format msgid "'%s' is not a valid value; use -1, 0 or 1" msgstr "" -#: ../cli/src/settings.c:2180 +#: ../clients/cli/settings.c:2807 #, c-format msgid "'%s' is not a valid Ethernet MAC" msgstr "" -#: ../cli/src/settings.c:2206 ../libnm-util/nm-setting-bridge.c:296 -#: ../libnm-util/nm-setting-connection.c:830 -#: ../libnm-util/nm-setting-vlan.c:548 +#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864 +#: ../libnm-core/nm-setting-infiniband.c:255 +#: ../libnm-util/nm-setting-connection.c:834 +#: ../libnm-util/nm-setting-infiniband.c:269 #, c-format msgid "'%s' is not a valid interface name" msgstr "" -#: ../clients/cli/settings.c:2373 +#: ../clients/cli/settings.c:2856 #, c-format msgid "'%s' is not a valid flag number; use <0-%d>" msgstr "" -#: ../clients/cli/settings.c:2385 +#: ../clients/cli/settings.c:2868 #, c-format msgid "Warning: '%s' sum is higher than all flags => all flags set\n" msgstr "" -#: ../cli/src/settings.c:2276 +#: ../clients/cli/settings.c:2909 #, c-format msgid "'%s' is not a valid hex character" msgstr "" -#: ../cli/src/settings.c:2306 +#: ../clients/cli/settings.c:2939 #, c-format msgid "'%s' is not a valid MAC" msgstr "" -#: ../cli/src/settings.c:2343 ../libnm-util/nm-setting-connection.c:793 +#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853 +#: ../libnm-util/nm-setting-connection.c:791 #, c-format msgid "'%s' is not a valid UUID" msgstr "" -#: ../cli/src/settings.c:2410 +#: ../clients/cli/settings.c:3032 #, c-format msgid "the property doesn't contain permission '%s'" msgstr "" -#: ../cli/src/settings.c:2422 +#: ../clients/cli/settings.c:3044 msgid "" "Enter a list of user permissions. This is a list of user names formatted " "as:\n" @@ -4282,37 +5168,37 @@ "Example: alice bob charlie\n" msgstr "" -#: ../cli/src/settings.c:2441 +#: ../clients/cli/settings.c:3063 #, c-format msgid "'%s' is not valid master; use ifname or connection UUID" msgstr "" -#: ../cli/src/settings.c:2485 +#: ../clients/cli/settings.c:3107 #, c-format msgid "Warning: %s is not an UUID of any existing connection profile\n" msgstr "" -#: ../cli/src/settings.c:2489 ../cli/src/settings.c:2505 +#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127 #, c-format msgid "'%s' is not a VPN connection profile" msgstr "" -#: ../cli/src/settings.c:2498 +#: ../clients/cli/settings.c:3120 #, c-format msgid "'%s' is not a name of any exiting profile" msgstr "" -#: ../cli/src/settings.c:2532 +#: ../clients/cli/settings.c:3154 #, c-format msgid "the value '%s' is not a valid UUID" msgstr "" -#: ../cli/src/settings.c:2539 +#: ../clients/cli/settings.c:3161 #, c-format msgid "the property doesn't contain UUID '%s'" msgstr "" -#: ../cli/src/settings.c:2551 +#: ../clients/cli/settings.c:3173 msgid "" "Enter secondary connections that should be activated when this connection " "is\n" @@ -4325,16 +5211,25 @@ "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n" msgstr "" -#: ../cli/src/settings.c:2628 +#: ../clients/cli/settings.c:3240 +msgid "" +"Enter a value which indicates whether the connection is subject to a data\n" +"quota, usage costs or other limitations. Accepted options are:\n" +"'true','yes','on' to set the connection as metered\n" +"'false','no','off' to set the connection as not metered\n" +"'unknown' to let NetworkManager choose a value using some heuristics\n" +msgstr "" + +#: ../clients/cli/settings.c:3364 msgid "private key password not provided" msgstr "" -#: ../cli/src/settings.c:2655 +#: ../clients/cli/settings.c:3392 #, c-format msgid "the property doesn't contain EAP method '%s'" msgstr "" -#: ../clients/cli/settings.c:2810 +#: ../clients/cli/settings.c:3409 msgid "" "Enter file path to CA certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -4342,12 +5237,12 @@ "Example: /home/cimrman/cacert.crt\n" msgstr "" -#: ../cli/src/settings.c:2680 +#: ../clients/cli/settings.c:3428 #, c-format msgid "the property doesn't contain alternative subject match '%s'" msgstr "" -#: ../clients/cli/settings.c:2845 +#: ../clients/cli/settings.c:3444 msgid "" "Enter file path to client certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -4355,7 +5250,7 @@ "Example: /home/cimrman/jara.crt\n" msgstr "" -#: ../clients/cli/settings.c:2857 +#: ../clients/cli/settings.c:3456 msgid "" "Enter file path to CA certificate for inner authentication (optionally " "prefixed\n" @@ -4365,13 +5260,13 @@ "Example: /home/cimrman/ca-zweite-phase.crt\n" msgstr "" -#: ../cli/src/settings.c:2709 +#: ../clients/cli/settings.c:3476 #, c-format msgid "" "the property doesn't contain \"phase2\" alternative subject match '%s'" msgstr "" -#: ../clients/cli/settings.c:2893 +#: ../clients/cli/settings.c:3492 msgid "" "Enter file path to client certificate for inner authentication (optionally " "prefixed\n" @@ -4381,7 +5276,7 @@ "Example: /home/cimrman/jara-zweite-phase.crt\n" msgstr "" -#: ../clients/cli/settings.c:2913 +#: ../clients/cli/settings.c:3512 msgid "" "Enter path to a private key and the key password (if not set yet):\n" " [file://]<file path> [<password>]\n" @@ -4389,7 +5284,7 @@ "Example: /home/cimrman/jara-priv-key Dardanely\n" msgstr "" -#: ../cli/src/settings.c:2805 +#: ../clients/cli/settings.c:3583 msgid "" "Enter bytes as a list of hexadecimal values.\n" "Two formats are accepted:\n" @@ -4402,7 +5297,7 @@ " ab 4 55 0xa6 ea 3a 74 C2\n" msgstr "" -#: ../cli/src/settings.c:2908 +#: ../clients/cli/settings.c:3704 #, c-format msgid "" "Enter a list of bonding options formatted as:\n" @@ -4420,50 +5315,54 @@ "Example: mode=2,miimon=120\n" msgstr "" -#: ../cli/src/settings.c:2949 +#: ../clients/cli/settings.c:3735 #, c-format msgid "'%s' is not a valid InfiniBand MAC" msgstr "" -#: ../cli/src/settings.c:2987 +#: ../clients/cli/settings.c:3772 #, c-format msgid "'%s' is not a valid IBoIP P_Key" msgstr "" -#: ../cli/src/settings.c:3238 ../cli/src/settings.c:3553 +#: ../clients/cli/settings.c:3803 #, c-format msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])" msgstr "" -#: ../cli/src/common.c:408 ../cli/src/settings.c:3030 -#: ../cli/src/settings.c:3049 +#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870 #, c-format msgid "invalid IPv4 address '%s'" msgstr "" -#: ../cli/src/settings.c:3055 ../cli/src/settings.c:3400 +#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184 #, c-format msgid "the property doesn't contain DNS server '%s'" msgstr "" -#: ../cli/src/settings.c:3067 +#: ../clients/cli/settings.c:3888 msgid "" "Enter a list of IPv4 addresses of DNS servers.\n" "\n" "Example: 8.8.8.8, 8.8.4.4\n" msgstr "" -#: ../cli/src/settings.c:3103 ../cli/src/settings.c:3454 +#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238 #, c-format msgid "the property doesn't contain DNS search domain '%s'" msgstr "" -#: ../cli/src/settings.c:3172 ../cli/src/settings.c:3522 +#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276 +#, c-format +msgid "the property doesn't contain DNS option '%s'" +msgstr "" + +#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329 #, c-format msgid "the property doesn't contain IP address '%s'" msgstr "" -#: ../clients/cli/settings.c:3374 +#: ../clients/cli/settings.c:4029 msgid "" "Enter a list of IPv4 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -4472,17 +5371,17 @@ "Example: 192.168.1.5/24, 10.0.0.11/24\n" msgstr "" -#: ../clients/cli/settings.c:3390 ../clients/cli/settings.c:3665 +#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358 #, c-format msgid "invalid gateway address '%s'" msgstr "" -#: ../cli/src/settings.c:3286 ../cli/src/settings.c:3601 +#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413 #, c-format msgid "the property doesn't contain route '%s'" msgstr "" -#: ../clients/cli/settings.c:3458 +#: ../clients/cli/settings.c:4113 msgid "" "Enter a list of IPv4 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -4495,13 +5394,12 @@ " 10.1.2.0/24\n" msgstr "" -#: ../cli/src/common.c:461 ../cli/src/settings.c:3375 -#: ../cli/src/settings.c:3394 +#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178 #, c-format msgid "invalid IPv6 address '%s'" msgstr "" -#: ../cli/src/settings.c:3412 +#: ../clients/cli/settings.c:4196 msgid "" "Enter a list of IPv6 addresses of DNS servers. If the IPv6 configuration " "method is 'auto' these DNS servers are appended to those (if any) returned " @@ -4513,7 +5411,7 @@ "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n" msgstr "" -#: ../clients/cli/settings.c:3649 +#: ../clients/cli/settings.c:4342 msgid "" "Enter a list of IPv6 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -4522,7 +5420,7 @@ "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n" msgstr "" -#: ../clients/cli/settings.c:3733 +#: ../clients/cli/settings.c:4426 msgid "" "Enter a list of IPv6 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -4536,28 +5434,28 @@ " abbe::/64 55\n" msgstr "" -#: ../cli/src/settings.c:2224 ../cli/src/settings.c:3631 -#: ../libnm-util/nm-setting-gsm.c:375 +#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363 +#: ../libnm-util/nm-setting-gsm.c:364 #, c-format msgid "'%s' is not a number" msgstr "" -#: ../cli/src/settings.c:3638 +#: ../clients/cli/settings.c:4450 #, c-format msgid "'%s' is not valid; use 0, 1, or 2" msgstr "" -#: ../cli/src/settings.c:3655 +#: ../clients/cli/settings.c:4497 #, c-format msgid "'%s' is not a valid channel; use <1-13>" msgstr "" -#: ../cli/src/settings.c:3676 +#: ../clients/cli/settings.c:4534 #, c-format msgid "'%s' is not valid; use [e, o, n]" msgstr "" -#: ../cli/src/settings.c:3704 +#: ../clients/cli/settings.c:4562 msgid "" "nmcli can accepts both direct JSON configuration data and a file name " "containing the configuration. In the latter case the file is read and the " @@ -4568,52 +5466,63 @@ " set team.config /etc/my-team.conf\n" msgstr "" -#: ../cli/src/settings.c:3744 +#: ../clients/cli/settings.c:4602 msgid "no priority to remove" msgstr "" -#: ../cli/src/settings.c:3748 +#: ../clients/cli/settings.c:4606 #, c-format msgid "index '%d' is not in the range of <0-%d>" msgstr "" -#: ../cli/src/settings.c:3787 +#: ../clients/cli/settings.c:4645 #, c-format msgid "" "Warning: only one mapping at a time is supported; taking the first one (%s)\n" msgstr "" -#: ../cli/src/settings.c:3794 +#: ../clients/cli/settings.c:4652 #, c-format msgid "the property doesn't contain mapping '%s'" msgstr "" -#: ../cli/src/settings.c:3903 ../cli/src/settings.c:4071 -#: ../libnm-util/nm-setting-wired.c:651 +#: ../clients/cli/settings.c:4700 +#, c-format +msgid "'%s' cannot be empty" +msgstr "" + +#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941 +#: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820 +#: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646 #: ../libnm-util/nm-setting-wireless.c:861 #: ../libnm-util/nm-setting-wireless.c:875 #, c-format msgid "'%s' is not a valid MAC address" msgstr "" -#: ../cli/src/settings.c:3909 ../cli/src/settings.c:4077 +#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947 #, c-format msgid "the property doesn't contain MAC address '%s'" msgstr "" -#: ../clients/cli/settings.c:4063 +#: ../clients/cli/settings.c:4799 #, c-format msgid "'%s' is not valid; 2 or 3 strings should be provided" msgstr "" -#: ../clients/cli/settings.c:4077 +#: ../clients/cli/settings.c:4813 msgid "" "Enter a list of subchannels (comma or space separated).\n" "\n" "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n" msgstr "" -#: ../cli/src/settings.c:3997 +#: ../clients/cli/settings.c:4835 +#, c-format +msgid "'%s' string value should consist of 1 - 199 characters" +msgstr "" + +#: ../clients/cli/settings.c:4867 #, c-format msgid "" "Enter a list of S/390 options formatted as:\n" @@ -4621,210 +5530,227 @@ "Valid options are: %s\n" msgstr "" -#: ../cli/src/settings.c:4043 +#: ../clients/cli/settings.c:4913 #, c-format msgid "'%s' is not a valid channel" msgstr "" -#: ../cli/src/settings.c:4049 +#: ../clients/cli/settings.c:4919 #, c-format msgid "'%ld' is not a valid channel" msgstr "" -#: ../cli/src/settings.c:4097 +#: ../clients/cli/settings.c:5013 #, c-format -msgid "'%s' is not a valid powersave value" +msgid "invalid option '%s', use 'default', 'never' or 'always'" msgstr "" -#: ../cli/src/settings.c:4157 ../cli/src/settings.c:4195 -#: ../cli/src/settings.c:4233 +#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113 +#: ../clients/cli/settings.c:5152 #, c-format msgid "the property doesn't contain protocol '%s'" msgstr "" -#: ../cli/src/settings.c:4272 +#: ../clients/cli/settings.c:5191 #, c-format msgid "" "'%s' not compatible with %s '%s', please change the key or set the right %s " "first." msgstr "" -#: ../cli/src/settings.c:4280 +#: ../clients/cli/settings.c:5199 #, c-format msgid "WEP key is guessed to be of '%s'\n" msgstr "" -#: ../cli/src/settings.c:4282 +#: ../clients/cli/settings.c:5201 #, c-format msgid "WEP key index set to '%d'\n" msgstr "" -#: ../cli/src/settings.c:4305 +#: ../clients/cli/settings.c:5224 #, c-format msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]" msgstr "" -#: ../cli/src/settings.c:4321 ../cli/src/settings.c:4324 -#: ../cli/src/settings.c:4327 ../cli/src/settings.c:4330 +#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243 +#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249 #, c-format msgid "" "Warning: '%s' is not compatible with '%s' type, please change or delete the " "key.\n" msgstr "" -#: ../cli/src/settings.c:4343 +#: ../clients/cli/settings.c:5262 #, c-format msgid "" "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, " "and 2 or passphrase.\n" msgstr "" -#: ../cli/src/settings.c:4356 +#: ../clients/cli/settings.c:5275 #, c-format msgid "'%s' is not a valid PSK" msgstr "" -#: ../cli/src/settings.c:4400 +#: ../clients/cli/settings.c:5319 #, c-format msgid "'%s' is not a valid DCB flag" msgstr "" -#: ../cli/src/settings.c:4423 +#: ../clients/cli/settings.c:5342 #, c-format msgid "'%s' is not a DCB app priority" msgstr "" -#: ../cli/src/settings.c:4449 +#: ../clients/cli/settings.c:5368 msgid "must contain 8 comma-separated numbers" msgstr "" -#: ../cli/src/settings.c:4466 +#: ../clients/cli/settings.c:5385 #, c-format msgid "'%s' not a number between 0 and %u (inclusive) or %u" msgstr "" -#: ../cli/src/settings.c:4469 +#: ../clients/cli/settings.c:5388 #, c-format msgid "'%s' not a number between 0 and %u (inclusive)" msgstr "" -#: ../cli/src/settings.c:4491 +#: ../clients/cli/settings.c:5410 #, c-format msgid "" "Warning: changes will have no effect until '%s' includes 1 (enabled)\n" "\n" msgstr "" -#: ../cli/src/settings.c:4544 +#: ../clients/cli/settings.c:5463 #, c-format msgid "bandwidth percentages must total 100%%" msgstr "" -#: ../cli/src/settings.c:6236 +#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555 +msgid "SIM operator ID must be a 5 or 6 number MCCMNC code" +msgstr "" + +#: ../clients/cli/settings.c:5598 +#, c-format +msgid "invalid option '%s', use '%s' or '%s'" +msgstr "" + +#: ../clients/cli/settings.c:7644 msgid "don't know how to get the property value" msgstr "" -#: ../cli/src/settings.c:6289 ../cli/src/settings.c:6329 +#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737 msgid "the property can't be changed" msgstr "" -#: ../clients/cli/settings.c:6552 +#: ../clients/cli/settings.c:7821 msgid "(not available)" msgstr "" -#: ../cli/src/settings.c:6433 +#: ../clients/cli/settings.c:7846 msgid "[NM property description]" msgstr "" -#: ../cli/src/settings.c:6439 +#: ../clients/cli/settings.c:7851 msgid "[nmcli specific description]" msgstr "" #. ---------------------------------------------------------------------------- -#: ../clients/cli/settings.c:6631 +#: ../clients/cli/settings.c:7900 msgid "<hidden>" msgstr "" -#: ../cli/src/utils.c:128 +#: ../clients/cli/utils.c:124 #, c-format msgid "Error: value for '%s' argument is required." msgstr "" -#: ../cli/src/utils.c:153 +#: ../clients/cli/utils.c:149 #, c-format msgid "Error: Argument '%s' was expected, but '%s' provided." msgstr "" -#: ../cli/src/utils.c:156 +#: ../clients/cli/utils.c:152 #, c-format msgid "Error: Unexpected argument '%s'" msgstr "" -#: ../cli/src/utils.c:206 +#: ../clients/cli/utils.c:202 #, c-format msgid "Error converting IP4 address '0x%X' to text form" msgstr "" -#: ../cli/src/utils.c:234 +#: ../clients/cli/utils.c:230 #, c-format msgid "Error converting IP6 address '%s' to text form" msgstr "" -#: ../cli/src/utils.c:408 +#. Translators: the first %s is the partial value entered by +#. * the user, the second %s a list of compatible values. +#. +#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577 #, c-format -msgid "'%s' is ambiguous (on x off)" +msgid "'%s' is ambiguous (%s)" msgstr "" -#: ../cli/src/utils.c:418 +#: ../clients/cli/utils.c:556 #, c-format msgid "'%s' is not valid; use [%s] or [%s]" msgstr "" -#: ../cli/src/utils.c:500 +#: ../clients/cli/utils.c:589 +#, c-format +msgid "'%s' is not valid; use [%s], [%s] or [%s]" +msgstr "" + +#: ../clients/cli/utils.c:688 #, c-format msgid "'%s' is ambiguous (%s x %s)" msgstr "" -#: ../cli/src/utils.c:512 +#: ../clients/cli/utils.c:700 #, c-format msgid "missing name, try one of [%s]" msgstr "" -#: ../cli/src/utils.c:729 +#: ../clients/cli/utils.c:964 #, c-format msgid "field '%s' has to be alone" msgstr "" -#: ../cli/src/utils.c:732 +#: ../clients/cli/utils.c:967 #, c-format msgid "invalid field '%s'; allowed fields: %s" msgstr "" -#: ../cli/src/utils.c:789 +#: ../clients/cli/utils.c:1024 msgid "Option '--terse' requires specifying '--fields'" msgstr "" -#: ../cli/src/utils.c:793 +#: ../clients/cli/utils.c:1028 #, c-format msgid "" "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" -#: ../cli/src/utils.c:1112 +#: ../clients/cli/utils.c:1390 #, c-format msgid "" "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" "nocheck to suppress the warning.\n" msgstr "" -#: ../cli/src/utils.c:1121 +#: ../clients/cli/utils.c:1399 #, c-format msgid "" "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " "execution using --nocheck, but the results are unpredictable." msgstr "" -#: ../clients/common/nm-polkit-listener.c:215 +#: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "" @@ -4832,1959 +5758,2356 @@ #. * is not visible here since we only care about phase2 authentication #. * (and don't even care of which one) #. -#: ../tui/nmt-page-wifi.c:329 ../tui/nmt-secret-agent.c:209 -#: ../tui/nmt-secret-agent.c:304 +#: ../clients/common/nm-secret-agent-simple.c:223 +#: ../clients/common/nm-secret-agent-simple.c:328 +#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332 msgid "Username" msgstr "" -#: ../tui/nmt-page-wifi.c:274 ../tui/nmt-page-wifi.c:305 -#: ../tui/nmt-page-wifi.c:335 ../tui/nmt-secret-agent.c:214 -#: ../tui/nmt-secret-agent.c:251 ../tui/nmt-secret-agent.c:281 -#: ../tui/nmt-secret-agent.c:314 ../tui/nmt-secret-agent.c:380 -#: ../tui/nmt-secret-agent.c:393 ../tui/nmt-secret-agent.c:409 +#: ../clients/common/nm-secret-agent-simple.c:230 +#: ../clients/common/nm-secret-agent-simple.c:273 +#: ../clients/common/nm-secret-agent-simple.c:303 +#: ../clients/common/nm-secret-agent-simple.c:342 +#: ../clients/common/nm-secret-agent-simple.c:492 +#: ../clients/common/nm-secret-agent-simple.c:507 +#: ../clients/common/nm-secret-agent-simple.c:525 +#: ../clients/common/nm-vpn-helpers.c:101 +#: ../clients/common/nm-vpn-helpers.c:102 +#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75 +#: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308 +#: ../clients/tui/nmt-page-wifi.c:341 msgid "Password" msgstr "" -#: ../tui/nmt-secret-agent.c:223 +#: ../clients/common/nm-secret-agent-simple.c:241 msgid "Identity" msgstr "" -#: ../tui/nmt-secret-agent.c:228 +#: ../clients/common/nm-secret-agent-simple.c:248 msgid "Private key password" msgstr "" -#: ../tui/nmt-page-wifi.c:286 ../tui/nmt-secret-agent.c:265 +#: ../clients/common/nm-secret-agent-simple.c:289 +#: ../clients/tui/nmt-page-wifi.c:289 msgid "Key" msgstr "" -#: ../tui/nmt-secret-agent.c:309 +#: ../clients/common/nm-secret-agent-simple.c:335 +#: ../clients/tui/nmt-page-dsl.c:78 msgid "Service" msgstr "" -#: ../tui/nmt-secret-agent.c:340 +#: ../clients/common/nm-secret-agent-simple.c:448 msgid "Authentication required by wireless network" msgstr "" -#: ../tui/nmt-secret-agent.c:341 +#: ../clients/common/nm-secret-agent-simple.c:449 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network " "'%s'." msgstr "" -#: ../tui/nmt-secret-agent.c:349 +#: ../clients/common/nm-secret-agent-simple.c:457 msgid "Wired 802.1X authentication" msgstr "" -#: ../tui/nmt-secret-agent.c:352 +#: ../clients/common/nm-secret-agent-simple.c:460 msgid "Network name" msgstr "" -#: ../tui/nmt-secret-agent.c:359 +#: ../clients/common/nm-secret-agent-simple.c:469 msgid "DSL authentication" msgstr "" -#: ../tui/nmt-secret-agent.c:367 +#: ../clients/common/nm-secret-agent-simple.c:477 msgid "PIN code required" msgstr "" -#: ../tui/nmt-secret-agent.c:368 +#: ../clients/common/nm-secret-agent-simple.c:478 msgid "PIN code is needed for the mobile broadband device" msgstr "" -#: ../tui/nmt-secret-agent.c:370 +#: ../clients/common/nm-secret-agent-simple.c:480 msgid "PIN" msgstr "" -#: ../tui/nmt-secret-agent.c:376 ../tui/nmt-secret-agent.c:389 -#: ../tui/nmt-secret-agent.c:405 +#: ../clients/common/nm-secret-agent-simple.c:488 +#: ../clients/common/nm-secret-agent-simple.c:503 +#: ../clients/common/nm-secret-agent-simple.c:521 msgid "Mobile broadband network password" msgstr "" -#: ../tui/nmt-secret-agent.c:377 ../tui/nmt-secret-agent.c:390 -#: ../tui/nmt-secret-agent.c:406 +#: ../clients/common/nm-secret-agent-simple.c:489 +#: ../clients/common/nm-secret-agent-simple.c:504 +#: ../clients/common/nm-secret-agent-simple.c:522 +#: ../clients/common/nm-secret-agent-simple.c:542 #, c-format msgid "A password is required to connect to '%s'." msgstr "" -#: ../test/nm-online.c:86 -#, c-format -msgid "\rConnecting" +#: ../clients/common/nm-secret-agent-simple.c:537 +msgid "VPN password required" +msgstr "" + +#: ../clients/common/nm-vpn-helpers.c:61 +msgid "could not get VPN plugin info" +msgstr "" + +#: ../clients/common/nm-vpn-helpers.c:103 +#: ../clients/common/nm-vpn-helpers.c:106 +msgid "Group password" msgstr "" -#: ../test/nm-online.c:118 +#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143 +#: ../clients/tui/nmt-page-ip6.c:143 +msgid "Gateway" +msgstr "" + +#: ../clients/common/nm-vpn-helpers.c:109 +msgid "Cookie" +msgstr "" + +#: ../clients/common/nm-vpn-helpers.c:110 +msgid "Gateway certificate hash" +msgstr "" + +#: ../clients/nm-online.c:94 +msgid "Connecting" +msgstr "" + +#: ../clients/nm-online.c:147 msgid "" "Time to wait for a connection, in seconds (without the option, default value " "is 30)" msgstr "" -#: ../test/nm-online.c:119 +#: ../clients/nm-online.c:148 msgid "Exit immediately if NetworkManager is not running or connecting" msgstr "" -#: ../test/nm-online.c:120 +#: ../clients/nm-online.c:149 msgid "Don't print anything" msgstr "" -#: ../test/nm-online.c:121 +#: ../clients/nm-online.c:150 msgid "Wait for NetworkManager startup instead of a connection" msgstr "" -#: ../test/nm-online.c:141 +#: ../clients/nm-online.c:171 msgid "" "Waits for NetworkManager to finish activating startup network connections." msgstr "" -#: ../test/nm-online.c:148 ../test/nm-online.c:158 +#: ../clients/nm-online.c:178 ../clients/nm-online.c:184 msgid "Invalid option. Please use --help to see a list of valid options." msgstr "" -#: ../tui/newt/nmt-newt-utils.c:179 ../tui/nmt-editor.c:245 -#: ../tui/nmt-password-dialog.c:175 ../tui/nmt-route-editor.c:135 -#: ../tui/nmtui-hostname.c:71 ../tui/nmtui.c:121 +#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415 +#: ../clients/tui/nmt-password-dialog.c:174 +#: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69 +#: ../clients/tui/nmtui.c:114 msgid "OK" msgstr "" -#: ../tui/newt/nmt-newt-utils.c:327 ../tui/newt/nmt-newt-utils.c:359 +#: ../clients/tui/newt/nmt-newt-utils.c:325 +#: ../clients/tui/newt/nmt-newt-utils.c:357 #, c-format msgid "Could not create temporary file: %s" msgstr "" -#: ../tui/newt/nmt-newt-utils.c:367 +#: ../clients/tui/newt/nmt-newt-utils.c:365 #, c-format msgid "Editor failed: %s" msgstr "" -#: ../tui/newt/nmt-newt-utils.c:375 +#: ../clients/tui/newt/nmt-newt-utils.c:373 #, c-format msgid "Editor failed with status %d" msgstr "" -#: ../tui/newt/nmt-newt-utils.c:377 +#: ../clients/tui/newt/nmt-newt-utils.c:375 #, c-format msgid "Editor failed with signal %d" msgstr "" -#: ../tui/newt/nmt-newt-utils.c:381 +#: ../clients/tui/newt/nmt-newt-utils.c:379 #, c-format msgid "Could not re-read file: %s" msgstr "" -#: ../tui/nm-editor-utils.c:160 +#: ../clients/tui/nm-editor-utils.c:150 #, c-format msgid "Ethernet connection %d" msgstr "" -#: ../tui/nm-editor-utils.c:168 +#: ../clients/tui/nm-editor-utils.c:158 #, c-format msgid "Wi-Fi connection %d" msgstr "" -#: ../src/devices/nm-device-infiniband.c:255 ../tui/nm-editor-utils.c:177 +#: ../clients/tui/nm-editor-utils.c:167 #, c-format msgid "InfiniBand connection %d" msgstr "" -#: ../libnm-glib/nm-device.c:1823 ../tui/nm-editor-utils.c:182 +#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859 +#: ../libnm/nm-device.c:1810 msgid "Mobile Broadband" msgstr "" -#: ../tui/nm-editor-utils.c:185 +#: ../clients/tui/nm-editor-utils.c:175 #, c-format msgid "Mobile broadband connection %d" msgstr "" -#: ../tui/nm-editor-utils.c:190 +#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62 msgid "DSL" msgstr "" -#: ../tui/nm-editor-utils.c:194 +#: ../clients/tui/nm-editor-utils.c:185 #, c-format msgid "DSL connection %d" msgstr "" -#: ../libnm-glib/nm-device.c:1827 ../libnm-util/nm-connection.c:1297 -#: ../src/settings/plugins/ifcfg-rh/reader.c:4285 ../tui/nm-editor-utils.c:200 +#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708 +#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626 +#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4186 msgid "Bond" msgstr "" -#: ../src/devices/nm-device-bond.c:138 ../tui/nm-editor-utils.c:204 +#: ../clients/tui/nm-editor-utils.c:194 #, c-format msgid "Bond connection %d" msgstr "" -#: ../libnm-glib/nm-device.c:1831 ../libnm-util/nm-connection.c:1301 -#: ../src/settings/plugins/ifcfg-rh/reader.c:4591 ../tui/nm-editor-utils.c:209 +#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712 +#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630 +#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4483 msgid "Bridge" msgstr "" -#: ../src/devices/nm-device-bridge.c:148 ../tui/nm-editor-utils.c:214 +#: ../clients/tui/nm-editor-utils.c:204 #, c-format msgid "Bridge connection %d" msgstr "" -#: ../libnm-glib/nm-device.c:1829 ../libnm-util/nm-connection.c:1299 -#: ../src/settings/plugins/ifcfg-rh/reader.c:4396 ../tui/nm-editor-utils.c:218 +#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710 +#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628 +#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4292 msgid "Team" msgstr "" -#: ../src/devices/nm-device-team.c:152 ../tui/nm-editor-utils.c:223 +#: ../clients/tui/nm-editor-utils.c:213 #, c-format msgid "Team connection %d" msgstr "" -#: ../src/devices/nm-device-vlan.c:230 ../tui/nm-editor-utils.c:231 +#: ../clients/tui/nm-editor-utils.c:221 #, c-format msgid "VLAN connection %d" msgstr "" -#: ../src/nm-manager.c:3466 ../tui/nm-editor-utils.c:246 +#: ../clients/tui/nm-editor-utils.c:236 #, c-format msgid "VPN connection %d" msgstr "" -#: ../tui/nmt-device-entry.c:391 +#: ../clients/tui/nmt-device-entry.c:370 msgid "Select..." msgstr "" -#: ../tui/nmt-edit-connection-list.c:129 +#: ../clients/tui/nmt-edit-connection-list.c:110 msgid "Add" msgstr "" -#: ../tui/nmt-edit-connection-list.c:132 ../tui/nmt-page-ip4.c:175 -#: ../tui/nmt-page-ip6.c:173 ../tui/nmt-page-team-port.c:110 -#: ../tui/nmt-page-team.c:180 +#: ../clients/tui/nmt-edit-connection-list.c:113 +#: ../clients/tui/nmt-page-ip4.c:169 ../clients/tui/nmt-page-ip6.c:167 +#: ../clients/tui/nmt-page-team-port.c:109 ../clients/tui/nmt-page-team.c:173 msgid "Edit..." msgstr "" -#: ../tui/nmt-edit-connection-list.c:135 ../tui/nmtui-edit.c:462 +#: ../clients/tui/nmt-edit-connection-list.c:116 +#: ../clients/tui/nmtui-edit.c:526 msgid "Delete" msgstr "" -#: ../tui/nmt-page-main.c:134 +#: ../clients/tui/nmt-editor-section.c:103 msgid "Hide" msgstr "" -#: ../tui/nmt-page-main.c:134 +#: ../clients/tui/nmt-editor-section.c:103 msgid "Show" msgstr "" -#: ../tui/nmt-editor.c:81 +#: ../clients/tui/nmt-editor.c:97 #, c-format msgid "Could not create editor for connection '%s' of type '%s'." msgstr "" -#: ../tui/nmt-editor.c:85 +#: ../clients/tui/nmt-editor.c:101 #, c-format msgid "Could not create editor for invalid connection '%s'." msgstr "" -#: ../tui/nmt-editor.c:95 +#: ../clients/tui/nmt-editor.c:111 msgid "Edit Connection" msgstr "" -#: ../tui/nmt-editor.c:144 +#: ../clients/tui/nmt-editor.c:164 #, c-format msgid "Unable to save connection: %s" msgstr "" -#: ../tui/nmt-editor.c:158 +#: ../clients/tui/nmt-editor.c:178 #, c-format msgid "Unable to add new connection: %s" msgstr "" -#: ../tui/nmt-page-main.c:181 +#: ../clients/tui/nmt-editor.c:320 msgid "Profile name" msgstr "" -#: ../clients/tui/nmt-editor.c:333 +#: ../clients/tui/nmt-editor.c:331 msgid "Ethernet device" msgstr "" -#: ../tui/nmt-page-main.c:188 +#: ../clients/tui/nmt-editor.c:333 msgid "Device" msgstr "" -#: ../tui/nmt-page-main.c:252 +#. And finally the bottom widgets +#: ../clients/tui/nmt-editor.c:391 msgid "Automatically connect" msgstr "" -#: ../tui/nmt-page-main.c:258 +#: ../clients/tui/nmt-editor.c:397 msgid "Available to all users" msgstr "" -#: ../tui/nmt-editor.c:242 ../tui/nmt-password-dialog.c:172 -#: ../tui/nmt-route-editor.c:128 ../tui/nmtui-edit.c:192 -#: ../tui/nmtui-edit.c:461 ../tui/nmtui-hostname.c:69 +#: ../clients/tui/nmt-editor.c:412 ../clients/tui/nmt-password-dialog.c:171 +#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:217 +#: ../clients/tui/nmtui-edit.c:525 ../clients/tui/nmtui-hostname.c:67 msgid "Cancel" msgstr "" -#: ../tui/nmt-mtu-entry.c:86 -msgid "(default)" -msgstr "" - -#: ../tui/nmt-mtu-entry.c:88 ../tui/nmt-mtu-entry.c:119 +#: ../clients/tui/nmt-mtu-entry.c:86 ../clients/tui/nmt-mtu-entry.c:117 msgid "bytes" msgstr "" -#: ../tui/nmt-page-bond.c:88 +#: ../clients/tui/nmt-page-bond.c:84 msgid "Round-robin" msgstr "" -#: ../tui/nmt-page-bond.c:89 +#: ../clients/tui/nmt-page-bond.c:85 msgid "Active Backup" msgstr "" -#: ../tui/nmt-page-bond.c:90 +#: ../clients/tui/nmt-page-bond.c:86 msgid "XOR" msgstr "" -#: ../tui/nmt-page-bond.c:91 +#: ../clients/tui/nmt-page-bond.c:87 msgid "Broadcast" msgstr "" -#: ../tui/nmt-page-bond.c:92 +#: ../clients/tui/nmt-page-bond.c:88 msgid "802.3ad" msgstr "" -#: ../tui/nmt-page-bond.c:93 +#: ../clients/tui/nmt-page-bond.c:89 msgid "Adaptive Transmit Load Balancing (tlb)" msgstr "" -#: ../tui/nmt-page-bond.c:94 +#: ../clients/tui/nmt-page-bond.c:90 msgid "Adaptive Load Balancing (alb)" msgstr "" -#: ../tui/nmt-page-bond.c:100 +#: ../clients/tui/nmt-page-bond.c:96 msgid "MII (recommended)" msgstr "" -#: ../tui/nmt-page-bond.c:101 +#: ../clients/tui/nmt-page-bond.c:97 msgid "ARP" msgstr "" -#: ../tui/nmt-page-bond.c:359 ../tui/nmt-page-bridge.c:86 -#: ../tui/nmt-page-team.c:159 +#: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:78 +#: ../clients/tui/nmt-page-team.c:152 msgid "Slaves" msgstr "" -#: ../tui/nmt-page-bond.c:371 ../tui/nmt-page-wifi.c:227 +#: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-wifi.c:230 msgid "Mode" msgstr "" -#: ../tui/nmt-page-bond.c:377 +#: ../clients/tui/nmt-page-bond.c:373 msgid "Primary" msgstr "" -#: ../tui/nmt-page-bond.c:383 +#: ../clients/tui/nmt-page-bond.c:379 msgid "Link monitoring" msgstr "" -#: ../tui/nmt-page-bond.c:389 ../tui/nmt-page-bond.c:396 -#: ../tui/nmt-page-bond.c:403 ../tui/nmt-page-bond.c:410 +#: ../clients/tui/nmt-page-bond.c:385 ../clients/tui/nmt-page-bond.c:392 +#: ../clients/tui/nmt-page-bond.c:399 ../clients/tui/nmt-page-bond.c:406 msgctxt "milliseconds" msgid "ms" msgstr "" -#: ../tui/nmt-page-bond.c:390 ../tui/nmt-page-bond.c:411 +#: ../clients/tui/nmt-page-bond.c:386 ../clients/tui/nmt-page-bond.c:407 msgid "Monitoring frequency" msgstr "" -#: ../tui/nmt-page-bond.c:397 +#: ../clients/tui/nmt-page-bond.c:393 msgid "Link up delay" msgstr "" -#: ../tui/nmt-page-bond.c:404 +#: ../clients/tui/nmt-page-bond.c:400 msgid "Link down delay" msgstr "" -#: ../tui/nmt-page-bond.c:417 +#: ../clients/tui/nmt-page-bond.c:413 msgid "ARP targets" msgstr "" -#: ../tui/nmt-page-bridge-port.c:38 +#: ../clients/tui/nmt-page-bridge-port.c:60 msgid "BRIDGE PORT" msgstr "" -#: ../tui/nmt-page-bridge-port.c:69 ../tui/nmt-page-bridge.c:112 +#: ../clients/tui/nmt-page-bridge-port.c:67 +#: ../clients/tui/nmt-page-bridge.c:110 msgid "Priority" msgstr "" -#: ../tui/nmt-page-bridge-port.c:75 +#: ../clients/tui/nmt-page-bridge-port.c:73 msgid "Path cost" msgstr "" -#: ../tui/nmt-page-bridge-port.c:77 +#: ../clients/tui/nmt-page-bridge-port.c:75 msgid "Hairpin mode" msgstr "" -#: ../tui/nmt-page-bridge.c:96 ../tui/nmt-page-bridge.c:121 -#: ../tui/nmt-page-bridge.c:131 ../tui/nmt-page-bridge.c:141 +#: ../clients/tui/nmt-page-bridge.c:88 ../clients/tui/nmt-page-bridge.c:119 +#: ../clients/tui/nmt-page-bridge.c:129 ../clients/tui/nmt-page-bridge.c:139 msgid "seconds" msgstr "" -#: ../tui/nmt-page-bridge.c:97 +#: ../clients/tui/nmt-page-bridge.c:89 msgid "Aging time" msgstr "" -#: ../tui/nmt-page-bridge.c:99 +#: ../clients/tui/nmt-page-bridge.c:91 +msgid "Enable IGMP snooping" +msgstr "" + +#: ../clients/tui/nmt-page-bridge.c:97 msgid "Enable STP (Spanning Tree Protocol)" msgstr "" -#: ../tui/nmt-page-bridge.c:122 +#: ../clients/tui/nmt-page-bridge.c:120 msgid "Forward delay" msgstr "" -#: ../tui/nmt-page-bridge.c:132 +#: ../clients/tui/nmt-page-bridge.c:130 msgid "Hello time" msgstr "" -#: ../tui/nmt-page-bridge.c:142 +#: ../clients/tui/nmt-page-bridge.c:140 msgid "Max age" msgstr "" -#: ../tui/nmt-page-ethernet.c:41 +#: ../clients/tui/nmt-page-ethernet.c:70 msgid "ETHERNET" msgstr "" -#: ../tui/nmt-page-ethernet.c:80 ../tui/nmt-page-vlan.c:132 -#: ../tui/nmt-page-wifi.c:358 +#: ../clients/tui/nmt-page-ethernet.c:77 ../clients/tui/nmt-page-vlan.c:122 +#: ../clients/tui/nmt-page-wifi.c:364 msgid "Cloned MAC address" msgstr "" -#: ../tui/nmt-page-infiniband.c:51 +#: ../clients/tui/nmt-page-infiniband.c:47 msgid "Datagram" msgstr "" -#: ../tui/nmt-page-infiniband.c:52 +#: ../clients/tui/nmt-page-infiniband.c:48 msgid "Connected" msgstr "" -#: ../tui/nmt-page-infiniband.c:40 +#: ../clients/tui/nmt-page-infiniband.c:81 msgid "INFINIBAND" msgstr "" -#: ../tui/nmt-page-infiniband.c:90 +#: ../clients/tui/nmt-page-infiniband.c:88 msgid "Transport mode" msgstr "" -#: ../tui/nmt-page-ip4.c:41 +#: ../clients/tui/nmt-page-ip4.c:38 msgid "Disabled" msgstr "" -#: ../tui/nmt-page-ip4.c:42 ../tui/nmt-page-ip6.c:42 +#: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:39 msgid "Automatic" msgstr "" -#: ../tui/nmt-page-ip4.c:43 ../tui/nmt-page-ip6.c:44 +#: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41 msgid "Link-Local" msgstr "" -#: ../tui/nmt-page-ip4.c:44 ../tui/nmt-page-ip6.c:45 +#: ../clients/tui/nmt-page-ip4.c:41 ../clients/tui/nmt-page-ip6.c:42 msgid "Manual" msgstr "" -#: ../tui/nmt-page-ip4.c:45 +#: ../clients/tui/nmt-page-ip4.c:42 msgid "Shared" msgstr "" -#: ../tui/nmt-page-ip4.c:100 ../tui/nmt-page-ip6.c:100 +#: ../clients/tui/nmt-page-ip4.c:82 ../clients/tui/nmt-page-ip6.c:82 msgid "(No custom routes)" msgstr "" -#: ../tui/nmt-page-ip4.c:103 ../tui/nmt-page-ip6.c:103 +#: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85 #, c-format msgid "One custom route" msgid_plural "%d custom routes" msgstr[0] "" msgstr[1] "" -#: ../tui/nmt-page-ip4.c:54 +#: ../clients/tui/nmt-page-ip4.c:128 msgid "IPv4 CONFIGURATION" msgstr "" -#: ../tui/nmt-page-ip4.c:144 ../tui/nmt-page-ip6.c:144 +#: ../clients/tui/nmt-page-ip4.c:136 ../clients/tui/nmt-page-ip6.c:136 msgid "Addresses" msgstr "" -#: ../tui/nmt-page-ip4.c:150 ../tui/nmt-page-ip6.c:150 -msgid "Gateway" -msgstr "" - -#: ../tui/nmt-page-ip4.c:156 ../tui/nmt-page-ip6.c:156 +#: ../clients/tui/nmt-page-ip4.c:150 ../clients/tui/nmt-page-ip6.c:150 msgid "DNS servers" msgstr "" -#: ../tui/nmt-page-ip4.c:162 ../tui/nmt-page-ip6.c:162 +#: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:156 msgid "Search domains" msgstr "" -#: ../tui/nmt-page-ip4.c:177 ../tui/nmt-page-ip6.c:175 +#: ../clients/tui/nmt-page-ip4.c:171 ../clients/tui/nmt-page-ip6.c:169 msgid "Routing" msgstr "" -#: ../tui/nmt-page-ip4.c:179 ../tui/nmt-page-ip6.c:177 +#: ../clients/tui/nmt-page-ip4.c:173 ../clients/tui/nmt-page-ip6.c:171 msgid "Never use this network for default route" msgstr "" -#: ../tui/nmt-page-ip4.c:187 +#: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177 +msgid "Ignore automatically obtained routes" +msgstr "" + +#: ../clients/tui/nmt-page-ip4.c:187 msgid "Require IPv4 addressing for this connection" msgstr "" -#: ../tui/nmt-page-ip6.c:41 +#: ../clients/tui/nmt-page-ip6.c:38 msgid "Ignore" msgstr "" -#: ../tui/nmt-page-ip6.c:43 +#: ../clients/tui/nmt-page-ip6.c:40 msgid "Automatic (DHCP-only)" msgstr "" -#: ../tui/nmt-page-ip6.c:54 +#: ../clients/tui/nmt-page-ip6.c:128 msgid "IPv6 CONFIGURATION" msgstr "" -#: ../tui/nmt-page-ip6.c:185 +#: ../clients/tui/nmt-page-ip6.c:185 msgid "Require IPv6 addressing for this connection" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:134 +#: ../clients/tui/nmt-page-ppp.c:131 msgid "PPP CONFIGURATION" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:143 +#: ../clients/tui/nmt-page-ppp.c:140 msgid "Allowed authentication methods:" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:150 +#: ../clients/tui/nmt-page-ppp.c:147 msgid "EAP" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:158 +#: ../clients/tui/nmt-page-ppp.c:155 msgid "PAP" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:166 +#: ../clients/tui/nmt-page-ppp.c:163 msgid "CHAP" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:174 +#: ../clients/tui/nmt-page-ppp.c:171 msgid "MSCHAPv2" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:182 +#: ../clients/tui/nmt-page-ppp.c:179 msgid "MSCHAP" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:198 +#: ../clients/tui/nmt-page-ppp.c:195 msgid "Use point-to-point encryption (MPPE)" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:210 +#: ../clients/tui/nmt-page-ppp.c:207 msgid "Require 128-bit encryption" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:220 +#: ../clients/tui/nmt-page-ppp.c:217 msgid "Use stateful MPPE" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:232 +#: ../clients/tui/nmt-page-ppp.c:229 msgid "Allow BSD data compression" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:240 +#: ../clients/tui/nmt-page-ppp.c:237 msgid "Allow Deflate data compression" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:248 +#: ../clients/tui/nmt-page-ppp.c:245 msgid "Use TCP header compression" msgstr "" -#: ../clients/tui/nmt-page-ppp.c:258 +#: ../clients/tui/nmt-page-ppp.c:255 msgid "Send PPP echo packets" msgstr "" -#: ../tui/nmt-page-team-port.c:45 +#: ../clients/tui/nmt-page-team-port.c:92 msgid "TEAM PORT" msgstr "" -#: ../tui/nmt-page-team-port.c:100 ../tui/nmt-page-team.c:170 +#: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163 msgid "JSON configuration" msgstr "" -#: ../tui/nmt-page-vlan.c:109 +#: ../clients/tui/nmt-page-vlan.c:99 msgid "Parent" msgstr "" -#: ../tui/nmt-page-vlan.c:124 +#: ../clients/tui/nmt-page-vlan.c:114 msgid "VLAN id" msgstr "" -#: ../tui/nmt-page-wifi.c:69 +#: ../clients/tui/nmt-page-wifi.c:64 msgctxt "Wi-Fi" msgid "Client" msgstr "" -#: ../tui/nmt-page-wifi.c:70 +#: ../clients/tui/nmt-page-wifi.c:65 msgid "Access Point" msgstr "" -#: ../tui/nmt-page-wifi.c:71 +#: ../clients/tui/nmt-page-wifi.c:66 msgid "Ad-Hoc Network" msgstr "" -#: ../tui/nmt-page-wifi.c:76 +#: ../clients/tui/nmt-page-wifi.c:71 msgctxt "Wi-Fi" msgid "Automatic" msgstr "" #. 802.11a Wi-Fi network -#: ../tui/nmt-page-wifi.c:78 +#: ../clients/tui/nmt-page-wifi.c:73 msgid "A (5 GHz)" msgstr "" #. 802.11b / 802.11g Wi-Fi network -#: ../tui/nmt-page-wifi.c:80 +#: ../clients/tui/nmt-page-wifi.c:75 msgid "B/G (2.4 GHz)" msgstr "" -#: ../tui/nmt-page-wifi.c:85 +#: ../clients/tui/nmt-page-wifi.c:80 msgctxt "Wi-Fi security" msgid "None" msgstr "" -#: ../tui/nmt-page-wifi.c:86 +#: ../clients/tui/nmt-page-wifi.c:81 msgid "WPA & WPA2 Personal" msgstr "" -#: ../tui/nmt-page-wifi.c:87 +#: ../clients/tui/nmt-page-wifi.c:82 msgid "WPA & WPA2 Enterprise" msgstr "" -#: ../tui/nmt-page-wifi.c:88 +#: ../clients/tui/nmt-page-wifi.c:83 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "" -#: ../tui/nmt-page-wifi.c:89 +#: ../clients/tui/nmt-page-wifi.c:84 msgid "WEP 128-bit Passphrase" msgstr "" -#: ../tui/nmt-page-wifi.c:90 +#: ../clients/tui/nmt-page-wifi.c:85 msgid "Dynamic WEP (802.1x)" msgstr "" -#: ../tui/nmt-page-wifi.c:91 +#: ../clients/tui/nmt-page-wifi.c:86 msgid "LEAP" msgstr "" -#: ../tui/nmt-page-wifi.c:96 +#: ../clients/tui/nmt-page-wifi.c:91 msgctxt "WEP key index" msgid "1 (Default)" msgstr "" -#: ../tui/nmt-page-wifi.c:97 +#: ../clients/tui/nmt-page-wifi.c:92 msgctxt "WEP key index" msgid "2" msgstr "" -#: ../tui/nmt-page-wifi.c:98 +#: ../clients/tui/nmt-page-wifi.c:93 msgctxt "WEP key index" msgid "3" msgstr "" -#: ../tui/nmt-page-wifi.c:99 +#: ../clients/tui/nmt-page-wifi.c:94 msgctxt "WEP key index" msgid "4" msgstr "" -#: ../tui/nmt-page-wifi.c:104 +#: ../clients/tui/nmt-page-wifi.c:99 msgid "Open System" msgstr "" -#: ../tui/nmt-page-wifi.c:105 +#: ../clients/tui/nmt-page-wifi.c:100 msgid "Shared Key" msgstr "" -#: ../tui/nmt-page-wifi.c:58 +#: ../clients/tui/nmt-page-wifi.c:214 msgid "WI-FI" msgstr "" -#: ../tui/nmt-page-wifi.c:253 +#: ../clients/tui/nmt-page-wifi.c:256 msgid "Channel" msgstr "" -#: ../tui/nmt-page-wifi.c:258 +#: ../clients/tui/nmt-page-wifi.c:261 msgid "Security" msgstr "" #. "wpa-enterprise" #. FIXME -#: ../tui/nmt-page-wifi.c:279 +#: ../clients/tui/nmt-page-wifi.c:282 msgid "(No support for wpa-enterprise yet...)" msgstr "" -#: ../tui/nmt-page-wifi.c:289 ../tui/nmt-page-wifi.c:308 +#: ../clients/tui/nmt-page-wifi.c:292 ../clients/tui/nmt-page-wifi.c:311 msgid "WEP index" msgstr "" -#: ../tui/nmt-page-wifi.c:297 ../tui/nmt-page-wifi.c:316 +#: ../clients/tui/nmt-page-wifi.c:300 ../clients/tui/nmt-page-wifi.c:319 msgid "Authentication" msgstr "" #. "dynamic-wep" #. FIXME -#: ../tui/nmt-page-wifi.c:322 +#: ../clients/tui/nmt-page-wifi.c:325 msgid "(No support for dynamic-wep yet...)" msgstr "" -#: ../tui/nmt-password-fields.c:130 +#: ../clients/tui/nmt-password-fields.c:128 msgid "Ask for this password every time" msgstr "" -#: ../tui/nmt-password-fields.c:131 +#: ../clients/tui/nmt-password-fields.c:129 msgid "Show password" msgstr "" -#: ../tui/nmt-route-table.c:226 +#: ../clients/tui/nmt-route-table.c:191 msgid "Destination" msgstr "" -#: ../tui/nmt-route-table.c:226 +#: ../clients/tui/nmt-route-table.c:191 msgid "Prefix" msgstr "" -#: ../tui/nmt-route-table.c:235 +#: ../clients/tui/nmt-route-table.c:200 msgid "Next Hop" msgstr "" -#: ../tui/nmt-route-table.c:243 +#: ../clients/tui/nmt-route-table.c:208 msgid "Metric" msgstr "" -#: ../tui/nmt-route-table.c:263 +#: ../clients/tui/nmt-route-table.c:228 msgid "No custom routes are defined." msgstr "" -#: ../tui/nmt-slave-list.c:138 +#: ../clients/tui/nmt-slave-list.c:136 msgid "Select the type of slave connection you wish to add." msgstr "" -#: ../tui/nmt-widget-list.c:142 +#: ../clients/tui/nmt-widget-list.c:139 msgid "Add..." msgstr "" -#: ../tui/nmt-widget-list.c:205 +#: ../clients/tui/nmt-widget-list.c:202 msgid "Remove" msgstr "" -#: ../tui/nmtui-connect.c:94 +#: ../clients/tui/nmtui-connect.c:54 +msgid "" +"openconnect will be run to authenticate.\n" +"It will return to nmtui when completed." +msgstr "" + +#: ../clients/tui/nmtui-connect.c:68 +#, c-format +msgid "Error: openconnect failed: %s" +msgstr "" + +#: ../clients/tui/nmtui-connect.c:75 +#, c-format +msgid "openconnect failed with status %d" +msgstr "" + +#: ../clients/tui/nmtui-connect.c:79 +#, c-format +msgid "openconnect failed with signal %d" +msgstr "" + +#: ../clients/tui/nmtui-connect.c:178 msgid "Activation failed" msgstr "" -#: ../tui/nmtui-connect.c:142 +#: ../clients/tui/nmtui-connect.c:233 msgid "Connecting..." msgstr "" -#: ../tui/nmtui-connect.c:172 ../tui/nmtui-connect.c:195 +#: ../clients/tui/nmtui-connect.c:268 ../clients/tui/nmtui-connect.c:299 #, c-format msgid "Could not activate connection: %s" msgstr "" -#: ../tui/nmtui-connect.c:259 ../tui/nmtui-connect.c:308 +#: ../clients/tui/nmtui-connect.c:359 ../clients/tui/nmtui-connect.c:408 msgid "Activate" msgstr "" -#: ../tui/nmtui-connect.c:261 +#: ../clients/tui/nmtui-connect.c:361 msgid "Deactivate" msgstr "" -#: ../tui/nmtui-connect.c:313 ../tui/nmtui-edit.c:95 ../tui/nmtui.c:115 +#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120 +#: ../clients/tui/nmtui.c:108 msgid "Quit" msgstr "" -#: ../tui/nmtui-connect.c:336 +#: ../clients/tui/nmtui-connect.c:436 #, c-format msgid "No such connection '%s'" msgstr "" -#: ../tui/nmtui-connect.c:338 +#: ../clients/tui/nmtui-connect.c:438 msgid "Connection is already active" msgstr "" -#: ../tui/nmtui-edit.c:200 +#: ../clients/tui/nmtui-edit.c:225 msgid "Create" msgstr "" -#: ../tui/nmtui-edit.c:341 +#: ../clients/tui/nmtui-edit.c:367 msgid "Select the type of connection you wish to create." msgstr "" -#: ../tui/nmtui-edit.c:348 +#: ../clients/tui/nmtui-edit.c:375 msgid "" "If you are creating a VPN, and the VPN connection you wish to create does " "not appear in the list, you may not have the correct VPN plugin installed." msgstr "" -#: ../tui/nmtui-edit.c:381 ../tui/nmtui-edit.c:397 +#: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427 msgid "New Connection" msgstr "" -#: ../tui/nmtui-edit.c:434 +#: ../clients/tui/nmtui-edit.c:466 #, c-format msgid "Unable to delete connection: %s" msgstr "" -#: ../clients/tui/nmtui-edit.c:506 +#: ../clients/tui/nmtui-edit.c:505 #, c-format msgid "Could not delete connection '%s': %s" msgstr "" -#: ../tui/nmtui-edit.c:463 +#: ../clients/tui/nmtui-edit.c:527 #, c-format msgid "Are you sure you want to delete the connection '%s'?" msgstr "" -#: ../tui/nmtui-hostname.c:47 +#: ../clients/tui/nmtui-hostname.c:45 msgid "Set Hostname" msgstr "" -#: ../tui/nmtui-hostname.c:55 +#: ../clients/tui/nmtui-hostname.c:53 msgid "Hostname" msgstr "" #. Translators: this indicates the result. ie, "I have set the hostname to ..." -#: ../tui/nmtui-hostname.c:114 +#: ../clients/tui/nmtui-hostname.c:116 #, c-format msgid "Set hostname to '%s'" msgstr "" -#: ../tui/nmtui-hostname.c:116 +#: ../clients/tui/nmtui-hostname.c:118 #, c-format msgid "Unable to set hostname: %s" msgstr "" -#: ../tui/nmtui.c:60 ../tui/nmtui.c:63 +#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56 msgid "connection" msgstr "" -#: ../tui/nmtui.c:61 +#: ../clients/tui/nmtui.c:54 msgid "Edit a connection" msgstr "" -#: ../tui/nmtui.c:64 +#: ../clients/tui/nmtui.c:57 msgid "Activate a connection" msgstr "" -#: ../tui/nmtui.c:66 +#: ../clients/tui/nmtui.c:59 msgid "new hostname" msgstr "" -#: ../tui/nmtui.c:67 +#: ../clients/tui/nmtui.c:60 msgid "Set system hostname" msgstr "" -#: ../tui/nmtui.c:90 +#: ../clients/tui/nmtui.c:83 msgid "NetworkManager TUI" msgstr "" -#: ../tui/nmtui.c:98 +#: ../clients/tui/nmtui.c:91 msgid "Please select an option" msgstr "" -#: ../tui/nmtui.c:159 +#: ../clients/tui/nmtui.c:143 msgid "Usage" msgstr "" -#: ../tui/nmtui.c:241 +#: ../clients/tui/nmtui.c:224 msgid "Could not parse arguments" msgstr "" -#: ../clients/tui/nmtui.c:237 +#: ../clients/tui/nmtui.c:234 #, c-format msgid "Could not contact NetworkManager: %s.\n" msgstr "" -#: ../tui/nmtui.c:251 +#: ../clients/tui/nmtui.c:239 msgid "NetworkManager is not running." msgstr "" -#: ../libnm-util/crypto.c:133 +#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131 #, c-format msgid "PEM key file had no end tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:146 +#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144 #, c-format msgid "Doesn't look like a PEM private key file." msgstr "" -#: ../libnm-util/crypto.c:163 +#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161 #, c-format msgid "Malformed PEM file: Proc-Type was not first tag." msgstr "" -#: ../libnm-util/crypto.c:171 +#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169 #, c-format msgid "Malformed PEM file: unknown Proc-Type tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:181 +#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179 #, c-format msgid "Malformed PEM file: DEK-Info was not the second tag." msgstr "" -#: ../libnm-util/crypto.c:192 +#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190 #, c-format msgid "Malformed PEM file: no IV found in DEK-Info tag." msgstr "" -#: ../libnm-util/crypto.c:199 +#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197 #, c-format msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." msgstr "" -#: ../libnm-util/crypto.c:214 +#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212 #, c-format msgid "Malformed PEM file: unknown private key cipher '%s'." msgstr "" -#: ../libnm-util/crypto.c:233 +#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231 #, c-format msgid "Could not decode private key." msgstr "" -#: ../libnm-util/crypto.c:285 +#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283 msgid "Failed to find expected PKCS#8 start tag." msgstr "" -#: ../libnm-util/crypto.c:293 +#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291 #, c-format msgid "Failed to find expected PKCS#8 end tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:312 +#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310 msgid "Failed to decode PKCS#8 private key." msgstr "" -#: ../libnm-util/crypto.c:354 +#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352 #, c-format msgid "IV must be an even number of bytes in length." msgstr "" -#: ../libnm-util/crypto.c:368 +#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366 #, c-format msgid "IV contains non-hexadecimal digits." msgstr "" -#: ../libnm-util/crypto.c:408 ../libnm-util/crypto_gnutls.c:150 -#: ../libnm-util/crypto_gnutls.c:267 ../libnm-util/crypto_nss.c:170 -#: ../libnm-util/crypto_nss.c:331 +#: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91 +#: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112 +#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406 +#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256 +#: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323 #, c-format msgid "Private key cipher '%s' was unknown." msgstr "" -#: ../libnm-util/crypto.c:518 +#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516 #, c-format msgid "Unable to determine private key type." msgstr "" -#: ../libnm-core/crypto.c:504 +#: ../libnm-core/crypto.c:502 #, c-format msgid "Password provided, but key was not encrypted." msgstr "" -#: ../libnm-util/crypto.c:573 +#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571 #, c-format msgid "PEM certificate had no start tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:582 +#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580 #, c-format msgid "PEM certificate had no end tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:600 +#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598 #, c-format msgid "Failed to decode certificate." msgstr "" -#: ../libnm-util/crypto_gnutls.c:50 +#: ../libnm-core/crypto_gnutls.c:48 ../libnm-util/crypto_gnutls.c:48 msgid "Failed to initialize the crypto engine." msgstr "" -#: ../libnm-util/crypto_gnutls.c:158 +#: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159 #, c-format msgid "Invalid IV length (must be at least %zd)." msgstr "" -#: ../libnm-util/crypto_gnutls.c:169 -#, c-format -msgid "Failed to initialize the decryption cipher context: %s / %s." -msgstr "" - -#: ../libnm-util/crypto_gnutls.c:178 +#: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175 #, c-format -msgid "Failed to set symmetric key for decryption: %s / %s." +msgid "Failed to initialize the decryption cipher context: %s (%s)" msgstr "" -#: ../libnm-util/crypto_gnutls.c:187 +#: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184 #, c-format -msgid "Failed to set IV for decryption: %s / %s." +msgid "Failed to decrypt the private key: %s (%s)" msgstr "" -#: ../libnm-util/crypto_gnutls.c:196 -#, c-format -msgid "Failed to decrypt the private key: %s / %s." -msgstr "" - -#: ../libnm-util/crypto_gnutls.c:206 ../libnm-util/crypto_nss.c:260 +#: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202 +#: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252 #, c-format msgid "Failed to decrypt the private key: unexpected padding length." msgstr "" -#: ../libnm-util/crypto_gnutls.c:217 ../libnm-util/crypto_nss.c:271 +#: ../libnm-core/crypto_gnutls.c:145 ../libnm-core/crypto_nss.c:213 +#: ../libnm-util/crypto_gnutls.c:205 ../libnm-util/crypto_nss.c:263 #, c-format msgid "Failed to decrypt the private key." msgstr "" -#: ../libnm-util/crypto_gnutls.c:289 -#, c-format -msgid "Failed to initialize the encryption cipher context: %s / %s." -msgstr "" - -#: ../libnm-util/crypto_gnutls.c:298 -#, c-format -msgid "Failed to set symmetric key for encryption: %s / %s." -msgstr "" - -#: ../libnm-util/crypto_gnutls.c:308 +#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283 #, c-format -msgid "Failed to set IV for encryption: %s / %s." +msgid "Failed to initialize the encryption cipher context: %s (%s)" msgstr "" -#: ../libnm-util/crypto_gnutls.c:317 +#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292 #, c-format -msgid "Failed to encrypt the data: %s / %s." +msgid "Failed to encrypt the data: %s (%s)" msgstr "" -#: ../libnm-util/crypto_gnutls.c:357 +#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332 #, c-format msgid "Error initializing certificate data: %s" msgstr "" -#: ../libnm-util/crypto_gnutls.c:379 +#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354 #, c-format msgid "Couldn't decode certificate: %s" msgstr "" -#: ../libnm-util/crypto_gnutls.c:403 +#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %s" msgstr "" -#: ../libnm-util/crypto_gnutls.c:416 +#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391 #, c-format msgid "Couldn't decode PKCS#12 file: %s" msgstr "" -#: ../libnm-util/crypto_gnutls.c:428 +#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403 #, c-format msgid "Couldn't verify PKCS#12 file: %s" msgstr "" -#: ../libnm-util/crypto_gnutls.c:456 +#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431 #, c-format msgid "Couldn't initialize PKCS#8 decoder: %s" msgstr "" -#: ../libnm-util/crypto_gnutls.c:479 +#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454 #, c-format msgid "Couldn't decode PKCS#8 file: %s" msgstr "" -#: ../libnm-util/crypto_nss.c:56 +#: ../libnm-core/crypto_nss.c:54 ../libnm-util/crypto_nss.c:53 #, c-format msgid "Failed to initialize the crypto engine: %d." msgstr "" -#: ../libnm-util/crypto_nss.c:178 +#: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170 #, c-format msgid "Invalid IV length (must be at least %d)." msgstr "" -#: ../libnm-util/crypto_nss.c:189 +#: ../libnm-core/crypto_nss.c:131 ../libnm-util/crypto_nss.c:181 #, c-format msgid "Failed to initialize the decryption cipher slot." msgstr "" -#: ../libnm-util/crypto_nss.c:199 +#: ../libnm-core/crypto_nss.c:141 ../libnm-util/crypto_nss.c:191 #, c-format msgid "Failed to set symmetric key for decryption." msgstr "" -#: ../libnm-util/crypto_nss.c:209 +#: ../libnm-core/crypto_nss.c:151 ../libnm-util/crypto_nss.c:201 #, c-format msgid "Failed to set IV for decryption." msgstr "" -#: ../libnm-util/crypto_nss.c:217 +#: ../libnm-core/crypto_nss.c:159 ../libnm-util/crypto_nss.c:209 #, c-format msgid "Failed to initialize the decryption context." msgstr "" -#: ../libnm-util/crypto_nss.c:230 +#: ../libnm-core/crypto_nss.c:172 ../libnm-util/crypto_nss.c:222 #, c-format msgid "Failed to decrypt the private key: %d." msgstr "" -#: ../libnm-util/crypto_nss.c:238 +#: ../libnm-core/crypto_nss.c:180 ../libnm-util/crypto_nss.c:230 #, c-format msgid "Failed to decrypt the private key: decrypted data too large." msgstr "" -#: ../libnm-util/crypto_nss.c:249 +#: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241 #, c-format msgid "Failed to finalize decryption of the private key: %d." msgstr "" -#: ../libnm-util/crypto_nss.c:353 +#: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345 #, c-format msgid "Failed to initialize the encryption cipher slot." msgstr "" -#: ../libnm-util/crypto_nss.c:361 +#: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353 #, c-format msgid "Failed to set symmetric key for encryption." msgstr "" -#: ../libnm-util/crypto_nss.c:369 +#: ../libnm-core/crypto_nss.c:315 ../libnm-util/crypto_nss.c:361 #, c-format msgid "Failed to set IV for encryption." msgstr "" -#: ../libnm-util/crypto_nss.c:377 +#: ../libnm-core/crypto_nss.c:323 ../libnm-util/crypto_nss.c:369 #, c-format msgid "Failed to initialize the encryption context." msgstr "" -#: ../libnm-util/crypto_nss.c:385 +#: ../libnm-core/crypto_nss.c:331 ../libnm-util/crypto_nss.c:377 #, c-format msgid "Failed to encrypt: %d." msgstr "" -#: ../libnm-util/crypto_nss.c:393 +#: ../libnm-core/crypto_nss.c:339 ../libnm-util/crypto_nss.c:385 #, c-format msgid "Unexpected amount of data after encrypting." msgstr "" -#: ../libnm-util/crypto_nss.c:433 +#: ../libnm-core/crypto_nss.c:382 ../libnm-util/crypto_nss.c:425 #, c-format msgid "Couldn't decode certificate: %d" msgstr "" -#: ../libnm-core/crypto_nss.c:423 +#: ../libnm-core/crypto_nss.c:420 #, c-format msgid "Password must be UTF-8" msgstr "" -#: ../libnm-util/crypto_nss.c:496 +#: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %d" msgstr "" -#: ../libnm-util/crypto_nss.c:505 +#: ../libnm-core/crypto_nss.c:459 ../libnm-util/crypto_nss.c:497 #, c-format msgid "Couldn't decode PKCS#12 file: %d" msgstr "" -#: ../libnm-util/crypto_nss.c:514 +#: ../libnm-core/crypto_nss.c:468 ../libnm-util/crypto_nss.c:506 #, c-format msgid "Couldn't verify PKCS#12 file: %d" msgstr "" -#: ../libnm-util/crypto_nss.c:558 +#: ../libnm-core/crypto_nss.c:519 ../libnm-util/crypto_nss.c:550 msgid "Could not generate random data." msgstr "" -#: ../libnm-core/nm-connection.c:226 +#: ../libnm-core/nm-connection.c:224 msgid "wrong type; should be a list of strings." msgstr "" -#: ../libnm-core/nm-connection.c:281 +#: ../libnm-core/nm-connection.c:294 msgid "unknown setting name" msgstr "" -#: ../libnm-core/nm-connection.c:805 +#: ../libnm-core/nm-connection.c:306 +msgid "duplicate setting name" +msgstr "" + +#: ../libnm-core/nm-connection.c:873 msgid "setting not found" msgstr "" -#: ../libnm-core/nm-connection.c:869 +#: ../libnm-core/nm-connection.c:937 msgid "setting not allowed in slave connection" msgstr "" -#: ../libnm-core/nm-connection.c:880 +#: ../libnm-core/nm-connection.c:948 msgid "setting is required for non-slave connections" msgstr "" -#: ../libnm-core/nm-connection.c:946 +#: ../libnm-core/nm-connection.c:1042 msgid "Unexpected failure to verify the connection" msgstr "" -#: ../libnm-core/nm-connection.c:979 +#: ../libnm-core/nm-connection.c:1075 msgid "Unexpected failure to normalize the connection" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:2280 ../libnm-util/nm-setting-8021x.c:2297 -#: ../libnm-util/nm-setting-8021x.c:2338 ../libnm-util/nm-setting-8021x.c:2355 -#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2419 -#: ../libnm-util/nm-setting-8021x.c:2437 ../libnm-util/nm-setting-8021x.c:2449 -#: ../libnm-util/nm-setting-8021x.c:2473 ../libnm-util/nm-setting-8021x.c:2651 -#: ../libnm-util/nm-setting-adsl.c:212 -#: ../libnm-util/nm-setting-bluetooth.c:144 -#: ../libnm-util/nm-setting-bluetooth.c:162 -#: ../libnm-util/nm-setting-bond.c:498 ../libnm-util/nm-setting-bridge.c:287 -#: ../libnm-util/nm-setting-cdma.c:163 -#: ../libnm-util/nm-setting-connection.c:770 -#: ../libnm-util/nm-setting-connection.c:786 -#: ../libnm-util/nm-setting-connection.c:841 -#: ../libnm-util/nm-setting-ip4-config.c:887 -#: ../libnm-util/nm-setting-ip6-config.c:812 -#: ../libnm-util/nm-setting-ip6-config.c:876 -#: ../libnm-util/nm-setting-olpc-mesh.c:127 -#: ../libnm-util/nm-setting-pppoe.c:165 ../libnm-util/nm-setting-team.c:141 -#: ../libnm-util/nm-setting-vpn.c:405 ../libnm-util/nm-setting-wimax.c:137 -#: ../libnm-util/nm-setting-wireless-security.c:893 +#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411 +#: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459 +#: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518 +#: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548 +#: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584 +#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189 +#: ../libnm-core/nm-setting-bluetooth.c:120 +#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141 +#: ../libnm-core/nm-setting-connection.c:837 +#: ../libnm-core/nm-setting-connection.c:876 +#: ../libnm-core/nm-setting-connection.c:989 +#: ../libnm-core/nm-setting-ip-config.c:2162 +#: ../libnm-core/nm-setting-olpc-mesh.c:120 +#: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419 +#: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126 +#: ../libnm-core/nm-setting-wireless-security.c:861 +#: ../libnm-core/nm-setting-wireless.c:729 ../libnm-util/nm-setting.c:1357 +#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394 +#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342 +#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400 +#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464 +#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494 +#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680 +#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142 +#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162 +#: ../libnm-util/nm-setting-connection.c:768 +#: ../libnm-util/nm-setting-connection.c:784 +#: ../libnm-util/nm-setting-connection.c:845 +#: ../libnm-util/nm-setting-ip4-config.c:869 +#: ../libnm-util/nm-setting-ip6-config.c:833 +#: ../libnm-util/nm-setting-ip6-config.c:896 +#: ../libnm-util/nm-setting-olpc-mesh.c:123 +#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423 +#: ../libnm-util/nm-setting-wimax.c:150 +#: ../libnm-util/nm-setting-wireless-security.c:890 #: ../libnm-util/nm-setting-wireless.c:771 msgid "property is missing" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:141 +#: ../libnm-core/nm-dbus-utils.c:188 +#, c-format +msgid "Method returned type '%s', but expected '%s'" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:136 msgid "ignoring missing number" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:150 +#: ../libnm-core/nm-keyfile-reader.c:145 #, c-format msgid "ignoring invalid number '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:170 +#: ../libnm-core/nm-keyfile-reader.c:165 #, c-format msgid "ignoring invalid %s address: %s" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:210 +#: ../libnm-core/nm-keyfile-reader.c:205 #, c-format msgid "ignoring invalid gateway '%s' for %s route" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:230 +#: ../libnm-core/nm-keyfile-reader.c:225 #, c-format msgid "ignoring invalid %s route: %s" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:348 +#: ../libnm-core/nm-keyfile-reader.c:343 #, c-format msgid "unexpected character '%c' for address %s: '%s' (position %td)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:358 +#: ../libnm-core/nm-keyfile-reader.c:353 #, c-format msgid "unexpected character '%c' for %s: '%s' (position %td)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:367 +#: ../libnm-core/nm-keyfile-reader.c:362 #, c-format msgid "" "unexpected character '%c' in prefix length for %s: '%s' (position %td)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:378 +#: ../libnm-core/nm-keyfile-reader.c:373 #, c-format msgid "garbage at the end of value %s: '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:384 +#: ../libnm-core/nm-keyfile-reader.c:379 #, c-format msgid "deprecated semicolon at the end of value %s: '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:399 +#: ../libnm-core/nm-keyfile-reader.c:394 #, c-format msgid "invalid prefix length for %s '%s', defaulting to %d" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:406 +#: ../libnm-core/nm-keyfile-reader.c:401 #, c-format msgid "missing prefix length for %s '%s', defaulting to %d" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:509 +#: ../libnm-core/nm-keyfile-reader.c:504 #, c-format msgid "ignoring invalid DNS server IPv4 address '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:548 +#: ../libnm-core/nm-keyfile-reader.c:543 #, c-format msgid "ignoring invalid DNS server IPv6 address '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:611 ../libnm-core/nm-keyfile-reader.c:752 -#: ../libnm-core/nm-keyfile-reader.c:1411 +#: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769 +#: ../libnm-core/nm-keyfile-reader.c:1446 #, c-format msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:625 +#: ../libnm-core/nm-keyfile-reader.c:642 msgid "ignoring invalid MAC address" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:741 +#: ../libnm-core/nm-keyfile-reader.c:758 msgid "ignoring invalid binary property" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:784 +#: ../libnm-core/nm-keyfile-reader.c:801 msgid "ignoring invalid SSID" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:800 +#: ../libnm-core/nm-keyfile-reader.c:817 msgid "ignoring invalid raw password" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:875 -#: ../libnm-core/nm-keyfile-reader.c:1041 +#: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058 #, c-format msgid "certificate or key file '%s' does not exist" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:880 +#: ../libnm-core/nm-keyfile-reader.c:897 #, c-format msgid "invalid key/cert value path \"%s\"" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:918 +#: ../libnm-core/nm-keyfile-reader.c:935 msgid "invalid key/cert value data:;base64, is not base64" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:931 +#: ../libnm-core/nm-keyfile-reader.c:948 msgid "invalid key/cert value data:;base64,file://" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1078 +#: ../libnm-core/nm-keyfile-reader.c:1095 msgid "invalid key/cert value is not a valid blob" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1083 +#: ../libnm-core/nm-keyfile-reader.c:1100 msgid "invalid key/cert value" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1130 +#: ../libnm-core/nm-keyfile-reader.c:1147 #, c-format msgid "invalid parity value '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1315 +#: ../libnm-core/nm-keyfile-reader.c:1347 #, c-format msgid "error loading setting value: %s" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1344 +#: ../libnm-core/nm-keyfile-reader.c:1379 #, c-format msgid "invalid negative value (%i)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1365 +#: ../libnm-core/nm-keyfile-reader.c:1400 #, c-format msgid "invalid char value (%i)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1388 +#: ../libnm-core/nm-keyfile-reader.c:1423 #, c-format msgid "invalid int64 value (%s)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1447 +#: ../libnm-core/nm-keyfile-reader.c:1482 #, c-format msgid "too large FLAGS property '%s' (%llu)" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1460 +#: ../libnm-core/nm-keyfile-reader.c:1495 #, c-format msgid "unhandled setting property type '%s'" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1491 +#: ../libnm-core/nm-keyfile-reader.c:1526 #, c-format msgid "invalid setting name '%s'" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:412 +#: ../libnm-core/nm-setting-8021x.c:414 msgid "data missing" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:444 +#: ../libnm-core/nm-setting-8021x.c:448 msgid "binary data missing" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:461 +#: ../libnm-core/nm-setting-8021x.c:465 msgid "file:// URI not NUL terminated" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:470 +#: ../libnm-core/nm-setting-8021x.c:474 msgid "file:// URI is empty" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:478 +#: ../libnm-core/nm-setting-8021x.c:482 msgid "file:// URI is not valid UTF-8" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:594 +#: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639 msgid "CA certificate must be in X.509 format" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:912 ../libnm-util/nm-setting-8021x.c:1175 -#: ../libnm-util/nm-setting-8021x.c:1498 +#: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276 +#: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957 +#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543 msgid "invalid certificate format" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:1767 +#: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812 msgid "invalid private key" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:2078 +#: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123 msgid "invalid phase2 private key" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:2287 ../libnm-util/nm-setting-8021x.c:2304 -#: ../libnm-util/nm-setting-8021x.c:2345 ../libnm-util/nm-setting-8021x.c:2362 -#: ../libnm-util/nm-setting-8021x.c:2413 ../libnm-util/nm-setting-8021x.c:2425 -#: ../libnm-util/nm-setting-8021x.c:2443 ../libnm-util/nm-setting-8021x.c:2455 -#: ../libnm-util/nm-setting-8021x.c:2480 ../libnm-util/nm-setting-adsl.c:219 -#: ../libnm-util/nm-setting-adsl.c:228 ../libnm-util/nm-setting-cdma.c:179 -#: ../libnm-util/nm-setting-cdma.c:188 -#: ../libnm-util/nm-setting-connection.c:777 -#: ../libnm-util/nm-setting-connection.c:848 -#: ../libnm-util/nm-setting-gsm.c:284 ../libnm-util/nm-setting-gsm.c:341 -#: ../libnm-util/nm-setting-gsm.c:350 -#: ../libnm-util/nm-setting-ip4-config.c:952 -#: ../libnm-util/nm-setting-ip4-config.c:961 -#: ../libnm-util/nm-setting-pppoe.c:172 ../libnm-util/nm-setting-pppoe.c:181 -#: ../libnm-util/nm-setting-vpn.c:414 ../libnm-util/nm-setting-vpn.c:424 -#: ../libnm-util/nm-setting-wimax.c:146 -#: ../libnm-util/nm-setting-wireless-security.c:923 -#: ../libnm-util/nm-setting-wireless-security.c:931 -#: ../libnm-util/nm-setting-wireless-security.c:955 +#: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435 +#: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483 +#: ../libnm-core/nm-setting-8021x.c:2524 ../libnm-core/nm-setting-8021x.c:2536 +#: ../libnm-core/nm-setting-8021x.c:2554 ../libnm-core/nm-setting-8021x.c:2566 +#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196 +#: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157 +#: ../libnm-core/nm-setting-connection.c:844 +#: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281 +#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375 +#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169 +#: ../libnm-core/nm-setting-ip4-config.c:198 +#: ../libnm-core/nm-setting-ip4-config.c:205 +#: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158 +#: ../libnm-core/nm-setting-vpn.c:428 ../libnm-core/nm-setting-vpn.c:438 +#: ../libnm-core/nm-setting-wimax.c:135 +#: ../libnm-core/nm-setting-wireless-security.c:891 +#: ../libnm-core/nm-setting-wireless-security.c:915 +#: ../libnm-core/nm-setting.c:1134 ../libnm-util/nm-setting-8021x.c:2332 +#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390 +#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458 +#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488 +#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525 +#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169 +#: ../libnm-util/nm-setting-cdma.c:178 +#: ../libnm-util/nm-setting-connection.c:775 +#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282 +#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934 +#: ../libnm-util/nm-setting-ip4-config.c:943 +#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179 +#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442 +#: ../libnm-util/nm-setting-wimax.c:159 +#: ../libnm-util/nm-setting-wireless-security.c:920 +#: ../libnm-util/nm-setting-wireless-security.c:944 msgid "property is empty" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:2315 ../libnm-util/nm-setting-8021x.c:2327 -#: ../libnm-util/nm-setting-8021x.c:2373 ../libnm-util/nm-setting-8021x.c:2385 +#: ../libnm-core/nm-setting-8021x.c:2448 ../libnm-core/nm-setting-8021x.c:2496 +#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372 +#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430 #, c-format msgid "has to match '%s' property for PKCS#12" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:2687 +#: ../libnm-core/nm-setting-8021x.c:2723 #, c-format msgid "certificate is invalid: %s" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:2626 ../libnm-util/nm-setting-8021x.c:2660 -#: ../libnm-util/nm-setting-bluetooth.c:153 -#: ../libnm-util/nm-setting-bond.c:507 -#: ../libnm-util/nm-setting-infiniband.c:203 -#: ../libnm-util/nm-setting-infiniband.c:218 -#: ../libnm-util/nm-setting-ip4-config.c:943 -#: ../libnm-util/nm-setting-ip6-config.c:867 -#: ../libnm-util/nm-setting-olpc-mesh.c:155 -#: ../libnm-util/nm-setting-team.c:150 ../libnm-util/nm-setting-wimax.c:155 -#: ../libnm-util/nm-setting-wired.c:663 ../libnm-util/nm-setting-wired.c:672 -#: ../libnm-util/nm-setting-wireless-security.c:974 -#: ../libnm-util/nm-setting-wireless-security.c:983 -#: ../libnm-util/nm-setting-wireless-security.c:991 +#: ../libnm-core/nm-setting-8021x.c:2758 +#: ../libnm-core/nm-setting-bluetooth.c:129 +#: ../libnm-core/nm-setting-infiniband.c:192 +#: ../libnm-core/nm-setting-infiniband.c:207 +#: ../libnm-core/nm-setting-ip4-config.c:189 +#: ../libnm-core/nm-setting-ip6-config.c:188 +#: ../libnm-core/nm-setting-ip6-config.c:199 +#: ../libnm-core/nm-setting-olpc-mesh.c:149 +#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665 +#: ../libnm-core/nm-setting-wired.c:675 +#: ../libnm-core/nm-setting-wireless-security.c:934 +#: ../libnm-core/nm-setting-wireless-security.c:943 +#: ../libnm-core/nm-setting-wireless-security.c:952 +#: ../libnm-core/nm-setting-wireless-security.c:988 +#: ../libnm-core/nm-setting-wireless-security.c:998 +#: ../libnm-core/nm-setting-wireless-security.c:1029 +#: ../libnm-core/nm-setting-wireless-security.c:1068 +#: ../libnm-core/nm-setting-wireless.c:790 +#: ../libnm-core/nm-setting-wireless.c:799 +#: ../libnm-core/nm-setting-wireless.c:808 ../libnm-util/nm-setting.c:1367 +#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404 +#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689 +#: ../libnm-util/nm-setting-bluetooth.c:151 +#: ../libnm-util/nm-setting-infiniband.c:205 +#: ../libnm-util/nm-setting-infiniband.c:221 +#: ../libnm-util/nm-setting-ip4-config.c:925 +#: ../libnm-util/nm-setting-ip6-config.c:887 +#: ../libnm-util/nm-setting-olpc-mesh.c:151 +#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658 +#: ../libnm-util/nm-setting-wired.c:667 +#: ../libnm-util/nm-setting-wireless-security.c:963 +#: ../libnm-util/nm-setting-wireless-security.c:972 +#: ../libnm-util/nm-setting-wireless-security.c:981 #: ../libnm-util/nm-setting-wireless-security.c:999 -#: ../libnm-util/nm-setting-wireless-security.c:1007 -#: ../libnm-util/nm-setting-wireless-security.c:1016 -#: ../libnm-util/nm-setting-wireless-security.c:1025 -#: ../libnm-util/nm-setting-wireless-security.c:1034 -#: ../libnm-util/nm-setting-wireless-security.c:1052 #: ../libnm-util/nm-setting-wireless.c:831 #: ../libnm-util/nm-setting-wireless.c:840 #: ../libnm-util/nm-setting-wireless.c:849 msgid "property is invalid" msgstr "" -#: ../libnm-util/nm-setting-8021x.c:2685 ../libnm-util/nm-setting-8021x.c:2695 -#: ../libnm-util/nm-setting-8021x.c:2705 ../libnm-util/nm-setting-8021x.c:2715 -#: ../libnm-util/nm-setting-8021x.c:2725 ../libnm-util/nm-setting-adsl.c:239 -#: ../libnm-util/nm-setting-adsl.c:250 -#: ../libnm-util/nm-setting-bluetooth.c:170 -#: ../libnm-util/nm-setting-wireless-security.c:902 +#: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793 +#: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813 +#: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208 +#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146 +#: ../libnm-core/nm-setting-wireless-security.c:870 +#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724 +#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744 +#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228 +#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168 +#: ../libnm-util/nm-setting-wireless-security.c:899 #, c-format msgid "'%s' is not a valid value for the property" msgstr "" -#: ../libnm-core/nm-setting-bluetooth.c:169 +#: ../libnm-core/nm-setting-bluetooth.c:168 #, c-format msgid "'%s' connection requires '%s' or '%s' setting" msgstr "" -#: ../libnm-util/nm-setting-bond.c:518 +#: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502 #, c-format msgid "invalid option '%s' or its value '%s'" msgstr "" -#: ../libnm-util/nm-setting-bond.c:537 +#: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:521 #, c-format msgid "only one of '%s' and '%s' can be set" msgstr "" -#: ../libnm-util/nm-setting-bond.c:548 +#: ../libnm-core/nm-setting-bond.c:523 ../libnm-util/nm-setting-bond.c:532 #, c-format msgid "mandatory option '%s' is missing" msgstr "" -#: ../libnm-util/nm-setting-bond.c:557 +#: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:541 #, c-format msgid "'%s' is not a valid value for '%s'" msgstr "" -#: ../libnm-util/nm-setting-bond.c:570 +#: ../libnm-core/nm-setting-bond.c:547 ../libnm-util/nm-setting-bond.c:554 #, c-format msgid "'%s=%s' is incompatible with '%s > 0'" msgstr "" -#: ../libnm-util/nm-setting-bond.c:583 +#: ../libnm-core/nm-setting-bond.c:560 ../libnm-util/nm-setting-bond.c:567 #, c-format msgid "'%s' is not a valid interface name for '%s' option" msgstr "" -#: ../libnm-util/nm-setting-bond.c:593 +#: ../libnm-core/nm-setting-bond.c:570 ../libnm-util/nm-setting-bond.c:577 #, c-format msgid "'%s' option is only valid for '%s=%s'" msgstr "" -#: ../libnm-util/nm-setting-bond.c:606 +#: ../libnm-core/nm-setting-bond.c:583 ../libnm-util/nm-setting-bond.c:590 #, c-format msgid "'%s=%s' is not a valid configuration for '%s'" msgstr "" -#: ../libnm-util/nm-setting-bond.c:619 ../libnm-util/nm-setting-bond.c:628 -#: ../libnm-util/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:684 +#: ../libnm-core/nm-setting-bond.c:596 ../libnm-core/nm-setting-bond.c:605 +#: ../libnm-core/nm-setting-bond.c:625 ../libnm-core/nm-setting-bond.c:661 +#: ../libnm-util/nm-setting-bond.c:603 ../libnm-util/nm-setting-bond.c:612 +#: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668 #, c-format msgid "'%s' option requires '%s' option to be set" msgstr "" -#: ../libnm-util/nm-setting-bond.c:659 +#: ../libnm-core/nm-setting-bond.c:636 ../libnm-util/nm-setting-bond.c:643 #, c-format msgid "'%s' option is empty" msgstr "" -#: ../libnm-util/nm-setting-bond.c:671 +#: ../libnm-core/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:655 #, c-format msgid "'%s' is not a valid IPv4 address for '%s' option" msgstr "" -#: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:683 +#: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682 #, c-format msgid "'%s' option is only valid with mode '%s'" msgstr "" -#: ../libnm-core/nm-setting-bond.c:653 +#: ../libnm-core/nm-setting-bond.c:687 +#, c-format +msgid "'%s' and '%s' cannot have different values" +msgstr "" + +#: ../libnm-core/nm-setting-bond.c:703 #, c-format msgid "'%s' option should be string" msgstr "" -#: ../libnm-util/nm-setting-bridge-port.c:155 -#: ../libnm-util/nm-setting-bridge-port.c:167 +#: ../libnm-core/nm-setting-bridge-port.c:124 +#: ../libnm-core/nm-setting-bridge-port.c:136 +#: ../libnm-util/nm-setting-bridge-port.c:154 +#: ../libnm-util/nm-setting-bridge-port.c:166 #, c-format msgid "'%d' is not a valid value for the property (should be <= %d)" msgstr "" -#: ../libnm-core/nm-setting-bridge-port.c:155 -#: ../libnm-core/nm-setting-team-port.c:98 +#: ../libnm-core/nm-setting-bridge-port.c:154 +#: ../libnm-core/nm-setting-team-port.c:97 #, c-format msgid "missing setting" msgstr "" -#: ../libnm-core/nm-setting-bridge-port.c:166 -#: ../libnm-core/nm-setting-team-port.c:109 +#: ../libnm-core/nm-setting-bridge-port.c:165 +#: ../libnm-core/nm-setting-team-port.c:108 #, c-format msgid "" "A connection with a '%s' setting must have the slave-type set to '%s'. " "Instead it is '%s'" msgstr "" -#: ../libnm-util/nm-setting-bridge.c:270 +#: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269 #, c-format msgid "value '%d' is out of range <%d-%d>" msgstr "" -#: ../libnm-util/nm-setting-bridge.c:306 ../libnm-util/nm-setting-wired.c:638 -#: ../libnm-util/nm-setting-wired.c:696 +#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:639 +#: ../libnm-core/nm-setting-wired.c:699 ../libnm-core/nm-setting-wired.c:727 +#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633 +#: ../libnm-util/nm-setting-wired.c:691 msgid "is not a valid MAC address" msgstr "" -#: ../libnm-util/nm-setting-cdma.c:170 -msgid "property is empty'" -msgstr "" - -#: ../libnm-core/nm-setting-connection.c:769 +#: ../libnm-core/nm-setting-connection.c:816 #, c-format msgid "setting required for connection of type '%s'" msgstr "" -#: ../libnm-core/nm-setting-connection.c:850 +#: ../libnm-core/nm-setting-connection.c:897 #, c-format msgid "connection type '%s' is not valid" msgstr "" -#: ../libnm-core/nm-setting-connection.c:885 -#: ../libnm-util/nm-setting-connection.c:878 +#: ../libnm-core/nm-setting-connection.c:932 +#: ../libnm-util/nm-setting-connection.c:877 #, c-format msgid "Unknown slave type '%s'" msgstr "" -#: ../libnm-core/nm-setting-connection.c:895 -#: ../libnm-util/nm-setting-connection.c:888 +#: ../libnm-core/nm-setting-connection.c:942 +#: ../libnm-util/nm-setting-connection.c:887 #, c-format msgid "Slave connections need a valid '%s' property" msgstr "" -#: ../libnm-core/nm-setting-connection.c:916 -#: ../libnm-util/nm-setting-connection.c:898 +#: ../libnm-core/nm-setting-connection.c:963 +#: ../libnm-util/nm-setting-connection.c:897 #, c-format msgid "Cannot set '%s' without '%s'" msgstr "" -#: ../libnm-core/nm-setting-connection.c:939 +#: ../libnm-core/nm-setting-connection.c:977 +#, c-format +msgid "metered value %d is not valid" +msgstr "" + +#: ../libnm-core/nm-setting-connection.c:998 #, c-format msgid "property type should be set to '%s'" msgstr "" -#: ../libnm-core/nm-setting-connection.c:954 +#: ../libnm-core/nm-setting-connection.c:1013 +#, c-format +msgid "slave-type '%s' requires a '%s' setting in the connection" +msgstr "" + +#: ../libnm-core/nm-setting-connection.c:1023 +#, c-format +msgid "" +"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " +"set to '%s'" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594 +msgid "flags invalid" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603 +msgid "flags invalid - disabled" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606 +#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678 +msgid "property invalid (not enabled)" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638 +msgid "element invalid" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653 +msgid "sum not 100%" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647 +#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719 +msgid "property invalid" +msgstr "" + +#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709 +msgid "property missing" +msgstr "" + +#: ../libnm-core/nm-setting-gsm.c:294 ../libnm-util/nm-setting-gsm.c:295 +#, c-format +msgid "property value '%s' is empty or too long (>64)" +msgstr "" + +#: ../libnm-core/nm-setting-gsm.c:326 ../libnm-util/nm-setting-gsm.c:327 +#, c-format +msgid "'%s' contains invalid char(s) (use [A-Za-z._-])" +msgstr "" + +#: ../libnm-core/nm-setting-gsm.c:352 ../libnm-util/nm-setting-gsm.c:353 +#, c-format +msgid "'%s' length is invalid (should be 5 or 6 digits)" +msgstr "" + +#: ../libnm-core/nm-setting-gsm.c:397 +msgid "property is empty or wrong size" +msgstr "" + +#: ../libnm-core/nm-setting-gsm.c:407 +msgid "property must contain only digits" +msgstr "" + +#: ../libnm-core/nm-setting-infiniband.c:217 +#: ../libnm-util/nm-setting-infiniband.c:231 +msgid "not a valid interface name" +msgstr "" + +#: ../libnm-core/nm-setting-infiniband.c:225 +#: ../libnm-util/nm-setting-infiniband.c:239 +msgid "Must specify a P_Key if specifying parent" +msgstr "" + +#: ../libnm-core/nm-setting-infiniband.c:235 +#: ../libnm-util/nm-setting-infiniband.c:249 +msgid "InfiniBand P_Key connection did not specify parent interface name" +msgstr "" + +#: ../libnm-core/nm-setting-infiniband.c:271 +#: ../libnm-util/nm-setting-infiniband.c:285 +#, c-format +msgid "" +"interface name of software infiniband device must be '%s' or unset (instead " +"it is '%s')" +msgstr "" + +#: ../libnm-core/nm-setting-infiniband.c:286 +#, c-format +msgid "mtu for transport mode '%s' can be at most %d but it is %d" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:133 +#, c-format +msgid "Missing IPv4 address" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:133 +#, c-format +msgid "Missing IPv6 address" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:138 +#, c-format +msgid "Invalid IPv4 address '%s'" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:138 +#, c-format +msgid "Invalid IPv6 address '%s'" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:152 +#, c-format +msgid "Invalid IPv4 address prefix '%u'" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:152 +#, c-format +msgid "Invalid IPv6 address prefix '%u'" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:170 +#, c-format +msgid "Invalid routing metric '%s'" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2182 +#, c-format +msgid "%d. DNS server address is invalid" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2198 +#, c-format +msgid "%d. IP address is invalid" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2210 +#, c-format +msgid "%d. IP address has 'label' property with invalid type" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2219 +#, c-format +msgid "%d. IP address has invalid label '%s'" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2233 +msgid "gateway cannot be set if there are no addresses configured" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2242 +msgid "gateway is invalid" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2256 +#, c-format +msgid "%d. route is invalid" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:2265 +#, c-format +msgid "%d. route cannot be a default route" +msgstr "" + +#: ../libnm-core/nm-setting-ip4-config.c:143 +#: ../libnm-core/nm-setting-ip6-config.c:144 +#: ../libnm-util/nm-setting-ip4-config.c:879 +#: ../libnm-util/nm-setting-ip6-config.c:843 +#, c-format +msgid "this property cannot be empty for '%s=%s'" +msgstr "" + +#: ../libnm-core/nm-setting-ip4-config.c:155 +#: ../libnm-core/nm-setting-ip4-config.c:165 +#: ../libnm-core/nm-setting-ip4-config.c:177 +#: ../libnm-core/nm-setting-ip6-config.c:156 +#: ../libnm-core/nm-setting-ip6-config.c:166 +#: ../libnm-core/nm-setting-ip6-config.c:176 +#: ../libnm-util/nm-setting-ip4-config.c:891 +#: ../libnm-util/nm-setting-ip4-config.c:901 +#: ../libnm-util/nm-setting-ip4-config.c:913 +#: ../libnm-util/nm-setting-ip6-config.c:855 +#: ../libnm-util/nm-setting-ip6-config.c:865 +#: ../libnm-util/nm-setting-ip6-config.c:875 +#, c-format +msgid "this property is not allowed for '%s=%s'" +msgstr "" + +#: ../libnm-core/nm-setting-ip4-config.c:214 +#, c-format +msgid "'%s' is not a valid FQDN" +msgstr "" + +#: ../libnm-core/nm-setting-ip4-config.c:223 +msgid "property cannot be set when dhcp-hostname is also set" +msgstr "" + +#: ../libnm-core/nm-setting-ip-tunnel.c:318 +#, c-format +msgid "'%d' is not a valid tunnel mode" +msgstr "" + +#: ../libnm-core/nm-setting-ip-tunnel.c:330 +#: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647 +#: ../libnm-core/nm-setting-vxlan.c:403 ../libnm-util/nm-setting-vlan.c:567 +#, c-format +msgid "'%s' is neither an UUID nor an interface name" +msgstr "" + +#: ../libnm-core/nm-setting-ip-tunnel.c:341 +#: ../libnm-core/nm-setting-ip-tunnel.c:352 +#, c-format +msgid "'%s' is not a valid IPv%c address" +msgstr "" + +#: ../libnm-core/nm-setting-ip-tunnel.c:366 +msgid "tunnel keys can only be specified for GRE tunnels" +msgstr "" + +#: ../libnm-core/nm-setting-ip-tunnel.c:379 +#: ../libnm-core/nm-setting-ip-tunnel.c:395 +#, c-format +msgid "'%s' is not a valid tunnel key" +msgstr "" + +#: ../libnm-core/nm-setting-ip-tunnel.c:407 +msgid "a fixed TTL is allowed only when path MTU discovery is enabled" +msgstr "" + +#: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661 +#: ../libnm-util/nm-setting-vlan.c:580 +#, c-format +msgid "property is not specified and neither is '%s:%s'" +msgstr "" + +#: ../libnm-core/nm-setting-macvlan.c:192 +msgid "non promiscuous operation is allowed only in passthru mode" +msgstr "" + +#: ../libnm-core/nm-setting-olpc-mesh.c:130 +#: ../libnm-core/nm-setting-wireless.c:739 +#: ../libnm-util/nm-setting-olpc-mesh.c:132 +#: ../libnm-util/nm-setting-wireless.c:780 +msgid "SSID length is out of range <1-32> bytes" +msgstr "" + +#: ../libnm-core/nm-setting-olpc-mesh.c:139 +#: ../libnm-core/nm-setting-wireless.c:779 +#: ../libnm-util/nm-setting-olpc-mesh.c:141 +#: ../libnm-util/nm-setting-wireless.c:820 +#, c-format +msgid "'%d' is not a valid channel" +msgstr "" + +#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387 +#, c-format +msgid "'%d' is out of valid range <128-16384>" +msgstr "" + +#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400 +#, c-format +msgid "setting this property requires non-zero '%s' property" +msgstr "" + +#: ../libnm-core/nm-setting-tun.c:187 +#, c-format +msgid "'%u': invalid mode" +msgstr "" + +#: ../libnm-core/nm-setting-tun.c:197 +#, c-format +msgid "'%s': invalid user ID" +msgstr "" + +#: ../libnm-core/nm-setting-tun.c:208 #, c-format -msgid "slave-type '%s' requires a '%s' setting in the connection" +msgid "'%s': invalid group ID" msgstr "" -#: ../libnm-core/nm-setting-connection.c:964 +#: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556 #, c-format -msgid "" -"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " -"set to '%s'" +msgid "'%s' value doesn't match '%s=%s'" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:595 -msgid "flags invalid" +#: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600 +#, c-format +msgid "the vlan id must be in range 0-4094 but is %u" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:604 -msgid "flags invalid - disabled" +#: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591 +msgid "flags are invalid" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:630 ../libnm-util/nm-setting-dcb.c:679 -msgid "property invalid (not enabled)" +#: ../libnm-core/nm-setting-vpn.c:460 +#, c-format +msgid "secret was empty" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:639 -msgid "element invalid" +#: ../libnm-core/nm-setting-vpn.c:490 +msgid "setting contained a secret with an empty name" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:654 -msgid "sum not 100%" +#: ../libnm-core/nm-setting-vpn.c:498 +#, c-format +msgid "secret value was empty" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:688 ../libnm-util/nm-setting-dcb.c:720 -msgid "property invalid" +#: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784 +msgid "not a secret property" msgstr "" -#: ../libnm-util/nm-setting-dcb.c:710 -msgid "property missing" +#: ../libnm-core/nm-setting-vpn.c:551 +msgid "secret is not of correct type" msgstr "" -#: ../libnm-util/nm-setting-gsm.c:297 +#: ../libnm-core/nm-setting-vpn.c:586 #, c-format -msgid "property value '%s' is empty or too long (>64)" +msgid "failed to convert value '%s' to uint" msgstr "" -#: ../libnm-util/nm-setting-gsm.c:329 -#, c-format -msgid "'%s' contains invalid char(s) (use [A-Za-z._-])" +#: ../libnm-core/nm-setting-vpn.c:594 +msgid "secret flags property not found" msgstr "" -#: ../libnm-util/nm-setting-gsm.c:364 +#: ../libnm-core/nm-setting-vxlan.c:375 #, c-format -msgid "'%s' length is invalid (should be 5 or 6 digits)" +msgid "'%s' is not a valid IP address" msgstr "" -#: ../libnm-util/nm-setting-infiniband.c:228 -msgid "not a valid interface name" +#: ../libnm-core/nm-setting-vxlan.c:388 +#, c-format +msgid "'%s' is not a valid IP%c address" msgstr "" -#: ../libnm-util/nm-setting-infiniband.c:236 -msgid "Must specify a P_Key if specifying parent" +#: ../libnm-core/nm-setting-vxlan.c:415 +#, c-format +msgid "%d is greater than local port max %d" msgstr "" -#: ../libnm-util/nm-setting-infiniband.c:246 -msgid "InfiniBand P_Key connection did not specify parent interface name" +#: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613 +#, c-format +msgid "'%s' is not a valid Ethernet port value" msgstr "" -#: ../libnm-core/nm-setting-infiniband.c:272 -#: ../libnm-util/nm-setting-infiniband.c:286 +#: ../libnm-core/nm-setting-wired.c:629 ../libnm-util/nm-setting-wired.c:623 #, c-format -msgid "" -"interface name of software infiniband device must be '%s' or unset (instead " -"it is '%s')" +msgid "'%s' is not a valid duplex value" msgstr "" -#: ../libnm-core/nm-setting-infiniband.c:287 +#: ../libnm-core/nm-setting-wired.c:688 ../libnm-util/nm-setting-wired.c:680 #, c-format -msgid "mtu for transport mode '%s' can be at most %d but it is %d" +msgid "invalid '%s' or its value '%s'" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:79 -#, c-format -msgid "Invalid IPv4 address '%s'" +#: ../libnm-core/nm-setting-wired.c:709 +msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:79 -#, c-format -msgid "Invalid IPv6 address '%s" +#: ../libnm-core/nm-setting-wired.c:718 +msgid "Wake-on-LAN password can only be used with magic packet mode" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:93 +#: ../libnm-core/nm-setting-wireless-security.c:882 +#: ../libnm-util/nm-setting-wireless-security.c:911 #, c-format -msgid "Invalid IPv4 address prefix '%u'" +msgid "'%s' security requires '%s=%s'" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:93 +#: ../libnm-core/nm-setting-wireless-security.c:903 +#: ../libnm-util/nm-setting-wireless-security.c:932 #, c-format -msgid "Invalid IPv6 address prefix '%u" +msgid "'%s' security requires '%s' setting presence" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:111 +#: ../libnm-core/nm-setting-wireless-security.c:924 +#: ../libnm-util/nm-setting-wireless-security.c:953 #, c-format -msgid "Invalid routing metric '%s'" +msgid "'%d' value is out of range <0-3>" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1861 +#: ../libnm-core/nm-setting-wireless-security.c:979 #, c-format -msgid "%d. DNS server address is invalid" +msgid "'%s' connections require '%s' in this property" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1877 +#: ../libnm-core/nm-setting-wireless-security.c:1009 +#: ../libnm-util/nm-setting-wireless-security.c:1010 #, c-format -msgid "%d. IP address is invalid" +msgid "'%s' can only be used with '%s=%s' (WEP)" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1889 +#: ../libnm-core/nm-setting-wireless.c:748 +#: ../libnm-util/nm-setting-wireless.c:789 #, c-format -msgid "%d. IP address has 'label' property with invalid type" +msgid "'%s' is not a valid Wi-Fi mode" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1898 +#: ../libnm-core/nm-setting-wireless.c:758 +#: ../libnm-util/nm-setting-wireless.c:799 #, c-format -msgid "%d. IP address has invalid label '%s'" +msgid "'%s' is not a valid band" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1912 -msgid "gateway cannot be set if there are no addresses configured" +#: ../libnm-core/nm-setting-wireless.c:768 +#, c-format +msgid "'%s' requires setting '%s' property" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1921 -msgid "gateway is invalid" +#: ../libnm-core/nm-setting.c:837 +#, c-format +msgid "duplicate property" msgstr "" -#: ../libnm-util/nm-setting-ip4-config.c:1025 +#: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912 #, c-format -msgid "%d. route is invalid" +msgid "can't set property of type '%s' from value of type '%s'" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1944 +#: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898 #, c-format -msgid "%d. route cannot be a default route" +msgid "failed to set property: %s" msgstr "" -#: ../libnm-util/nm-setting-ip4-config.c:897 -#: ../libnm-util/nm-setting-ip6-config.c:822 +#: ../libnm-core/nm-setting.c:926 #, c-format -msgid "this property cannot be empty for '%s=%s'" +msgid "can not set property: %s" msgstr "" -#: ../libnm-util/nm-setting-ip4-config.c:909 -#: ../libnm-util/nm-setting-ip4-config.c:919 -#: ../libnm-util/nm-setting-ip4-config.c:931 -#: ../libnm-util/nm-setting-ip6-config.c:835 -#: ../libnm-util/nm-setting-ip6-config.c:845 -#: ../libnm-util/nm-setting-ip6-config.c:855 +#: ../libnm-core/nm-setting.c:942 #, c-format -msgid "this property is not allowed for '%s=%s'" +msgid "unknown property" msgstr "" -#: ../libnm-util/nm-setting-ip6-config.c:834 -#, c-format -msgid "'%s' not allowed for %s=%s" +#: ../libnm-core/nm-setting.c:1682 +msgid "secret not found" msgstr "" -#: ../libnm-util/nm-setting-olpc-mesh.c:136 -#: ../libnm-util/nm-setting-wireless.c:780 -msgid "SSID length is out of range <1-32> bytes" +#: ../libnm-core/nm-setting.c:1774 +msgid "secret is not set" msgstr "" -#: ../libnm-util/nm-setting-olpc-mesh.c:145 -#: ../libnm-util/nm-setting-wireless.c:820 +#: ../libnm-core/nm-utils.c:2447 #, c-format -msgid "'%d' is not a valid channel" +msgid "failed stat file %s: %s" msgstr "" -#: ../libnm-util/nm-setting-ppp.c:390 +#: ../libnm-core/nm-utils.c:2456 #, c-format -msgid "'%d' is out of valid range <128-16384>" +msgid "not a file (%s)" msgstr "" -#: ../libnm-util/nm-setting-ppp.c:403 +#: ../libnm-core/nm-utils.c:2467 #, c-format -msgid "setting this property requires non-zero '%s' property" +msgid "invalid file owner %d for %s" msgstr "" -#: ../libnm-util/nm-setting-vlan.c:570 +#: ../libnm-core/nm-utils.c:2478 #, c-format -msgid "'%s' value doesn't match '%s=%s'" +msgid "file permissions for %s" msgstr "" -#: ../libnm-util/nm-setting-vlan.c:581 +#: ../libnm-core/nm-utils.c:2488 #, c-format -msgid "'%s' is neither an UUID nor an interface name" +msgid "reject %s" msgstr "" -#: ../libnm-util/nm-setting-vlan.c:594 +#: ../libnm-core/nm-utils.c:2508 #, c-format -msgid "property is not specified and neither is '%s:%s'" +msgid "path is not absolute (%s)" msgstr "" -#: ../libnm-util/nm-setting-vlan.c:607 -msgid "flags are invalid" +#: ../libnm-core/nm-utils.c:2522 +#, c-format +msgid "Plugin file does not exist (%s)" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:441 +#: ../libnm-core/nm-utils.c:2530 #, c-format -msgid "secret was empty" +msgid "Plugin is not a valid file (%s)" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:471 -msgid "setting contained a secret with an empty name" +#: ../libnm-core/nm-utils.c:2540 +#, c-format +msgid "libtool archives are not supported (%s)" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:479 +#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1802 #, c-format -msgid "secret value was empty" +msgid "Could not find \"%s\" binary" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:526 ../libnm-core/nm-setting.c:1650 -msgid "not a secret property" +#: ../libnm-core/nm-vpn-editor-plugin.c:132 +#, c-format +msgid "cannot load plugin %s" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:532 -msgid "secret is not of correct type" +#: ../libnm-core/nm-vpn-editor-plugin.c:160 +#, c-format +msgid "cannot load VPN plugin in '%s': missing plugin name" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:567 +#: ../libnm-core/nm-vpn-editor-plugin.c:167 #, c-format -msgid "failed to convert value '%s' to uint" +msgid "cannot load VPN plugin in '%s': invalid service name" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:575 -msgid "secret flags property not found" +#: ../libnm-core/nm-vpn-editor-plugin.c:183 +#, c-format +msgid "unknown error initializing plugin %s" msgstr "" -#: ../libnm-util/nm-setting-wired.c:618 +#: ../libnm-core/nm-vpn-editor-plugin.c:195 #, c-format -msgid "'%s' is not a valid Ethernet port value" +msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)" msgstr "" -#: ../libnm-util/nm-setting-wired.c:628 +#: ../libnm-core/nm-vpn-editor-plugin.c:256 #, c-format -msgid "'%s' is not a valid duplex value" +msgid "the plugin does not support import capability" msgstr "" -#: ../libnm-util/nm-setting-wired.c:685 +#: ../libnm-core/nm-vpn-editor-plugin.c:276 #, c-format -msgid "invalid '%s' or its value '%s'" +msgid "the plugin does not support export capability" msgstr "" -#: ../libnm-util/nm-setting-wireless-security.c:914 +#: ../libnm-core/nm-vpn-plugin-info.c:109 #, c-format -msgid "'%s' security requires '%s=%s'" +msgid "missing filename" msgstr "" -#: ../libnm-util/nm-setting-wireless-security.c:943 +#: ../libnm-core/nm-vpn-plugin-info.c:117 #, c-format -msgid "'%s' security requires '%s' setting presence" +msgid "filename must be an absolute path (%s)" msgstr "" -#: ../libnm-util/nm-setting-wireless-security.c:964 +#: ../libnm-core/nm-vpn-plugin-info.c:126 #, c-format -msgid "'%d' value is out of range <0-3>" +msgid "filename has invalid format (%s)" msgstr "" -#: ../libnm-core/nm-setting-wireless-security.c:980 -#: ../libnm-util/nm-setting-wireless-security.c:1010 +#: ../libnm-core/nm-vpn-plugin-info.c:383 #, c-format -msgid "'%s' connections require '%s' in this property" +msgid "there exists a conflicting plugin (%s) that has the same %s.%s value" msgstr "" -#: ../libnm-util/nm-setting-wireless-security.c:1063 +#: ../libnm-core/nm-vpn-plugin-info.c:421 #, c-format -msgid "'%s' can only be used with '%s=%s' (WEP)" +msgid "there exists a conflicting plugin with the same name (%s)" msgstr "" -#: ../libnm-util/nm-setting-wireless.c:789 +#: ../libnm-core/nm-vpn-plugin-info.c:740 #, c-format -msgid "'%s' is not a valid Wi-Fi mode" +msgid "missing \"plugin\" setting" msgstr "" -#: ../libnm-util/nm-setting-wireless.c:799 +#: ../libnm-core/nm-vpn-plugin-info.c:750 #, c-format -msgid "'%s' is not a valid band" +msgid "%s: don't retry loading plugin which already failed previously" msgstr "" -#: ../libnm-core/nm-setting-wireless.c:749 -#, c-format -msgid "'%s' requires setting '%s' property" +#: ../libnm-core/nm-vpn-plugin-info.c:842 +msgid "missing filename to load VPN plugin info" msgstr "" -#: ../libnm-core/nm-setting.c:833 -#, c-format -msgid "can't set property of type '%s' from value of type '%s'" +#: ../libnm-core/nm-vpn-plugin-info.c:854 +msgid "missing name for VPN plugin info" msgstr "" -#: ../libnm-core/nm-setting.c:1548 -msgid "secret not found" +#: ../libnm-core/nm-vpn-plugin-info.c:863 +msgid "missing service for VPN plugin info" msgstr "" -#: ../libnm-core/nm-setting.c:1640 -msgid "secret is not set" +#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804 +msgid "Bluetooth" msgstr "" -#: ../libnm-core/nm-utils.c:2465 ../libnm-util/nm-utils.c:1813 -#, c-format -msgid "Could not find \"%s\" binary" +#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824 +msgid "MACVLAN" msgstr "" -#: ../libnm-glib/nm-device.c:1817 -msgid "Bluetooth" +#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828 +msgid "IPTunnel" msgstr "" -#: ../libnm-glib/nm-device.c:1835 -msgid "ADSL" +#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832 +msgid "Veth" msgstr "" -#: ../libnm-glib/nm-device.c:1863 +#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864 msgid "Wired" msgstr "" -#: ../libnm-glib/nm-device.c:1894 +#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895 msgid "PCI" msgstr "" -#: ../libnm-glib/nm-device.c:1896 +#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897 msgid "USB" msgstr "" @@ -6794,72 +8117,79 @@ #. * "%2$s (%1$s)" if there's no grammatical way to combine #. * the strings otherwise. #. -#: ../libnm-glib/nm-device.c:1992 ../libnm-glib/nm-device.c:2011 +#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061 +#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010 #, c-format msgctxt "long device name" msgid "%s %s" msgstr "" -#: ../libnm-glib/nm-remote-connection.c:151 +#: ../libnm-glib/nm-remote-connection.c:149 msgid "Disconnected by D-Bus" msgstr "" -#: ../libnm-util/crypto_gnutls.c:92 +#: ../libnm-util/crypto_gnutls.c:84 +#, c-format +msgid "Hash length too long (%d > %d)." +msgstr "" + +#: ../libnm-util/crypto_gnutls.c:115 #, c-format -msgid "Failed to initialize the MD5 engine: %s / %s." +msgid "Failed to initialize the MD5 engine: %s (%s)" msgstr "" -#: ../libnm-util/crypto_nss.c:107 +#: ../libnm-util/crypto_nss.c:99 #, c-format msgid "Failed to initialize the MD5 context: %d." msgstr "" -#: ../libnm-util/crypto_nss.c:468 +#: ../libnm-util/crypto_nss.c:460 #, c-format msgid "Couldn't convert password to UCS2: %d" msgstr "" -#: ../libnm-util/nm-setting-bluetooth.c:188 +#: ../libnm-util/nm-setting-bluetooth.c:186 #, c-format msgid "requires '%s' or '%s' setting" msgstr "" -#: ../libnm-util/nm-setting-connection.c:858 +#: ../libnm-util/nm-setting-connection.c:862 #, c-format msgid "requires presence of '%s' setting in the connection" msgstr "" -#: ../libnm-util/nm-setting-ip4-config.c:978 +#: ../libnm-util/nm-setting-ip4-config.c:957 #, c-format msgid "%d. IPv4 address is invalid" msgstr "" -#: ../libnm-util/nm-setting-ip4-config.c:988 +#: ../libnm-util/nm-setting-ip4-config.c:967 #, c-format msgid "%d. IPv4 address has invalid prefix" msgstr "" -#: ../libnm-util/nm-setting-ip4-config.c:1035 +#: ../libnm-util/nm-setting-ip4-config.c:983 +#: ../libnm-util/nm-setting-ip6-config.c:936 #, c-format msgid "%d. route has invalid prefix" msgstr "" -#: ../libnm-util/nm-setting-ip6-config.c:913 +#: ../libnm-util/nm-setting-ip6-config.c:910 #, c-format msgid "%d. IPv6 address is invalid" msgstr "" -#: ../libnm-util/nm-setting-ip6-config.c:923 +#: ../libnm-util/nm-setting-ip6-config.c:920 #, c-format msgid "%d. IPv6 address has invalid prefix" msgstr "" -#: ../libnm-util/nm-setting-vpn.c:583 +#: ../libnm-util/nm-setting-vpn.c:582 #, c-format msgid "Failed to convert '%s' value '%s' to uint" msgstr "" -#: ../libnm-util/nm-setting-vpn.c:590 +#: ../libnm-util/nm-setting-vpn.c:589 #, c-format msgid "Secret flags property '%s' not found" msgstr "" @@ -6869,131 +8199,173 @@ msgid "requires setting '%s' property" msgstr "" -#: ../libnm/nm-device-adsl.c:73 +#: ../libnm/nm-device-adsl.c:74 msgid "The connection was not an ADSL connection." msgstr "" -#: ../libnm/nm-device-bond.c:115 +#: ../libnm/nm-device-bond.c:112 msgid "The connection was not a bond connection." msgstr "" -#: ../libnm/nm-device-bridge.c:115 +#: ../libnm/nm-device-bridge.c:112 msgid "The connection was not a bridge connection." msgstr "" -#: ../libnm/nm-device-bt.c:140 +#: ../libnm/nm-device-bt.c:137 #, c-format msgid "The connection was not a Bluetooth connection." msgstr "" -#: ../libnm/nm-device-bt.c:149 +#: ../libnm/nm-device-bt.c:146 msgid "Invalid device Bluetooth address." msgstr "" -#: ../libnm/nm-device-bt.c:156 +#: ../libnm/nm-device-bt.c:153 msgid "" "The Bluetooth addresses of the device and the connection didn't match." msgstr "" -#: ../libnm/nm-device-bt.c:165 +#: ../libnm/nm-device-bt.c:162 msgid "" "The device is lacking Bluetooth capabilities required by the connection." msgstr "" -#: ../libnm/nm-device-ethernet.c:138 +#: ../libnm/nm-device-ethernet.c:207 msgid "The connection was not an Ethernet or PPPoE connection." msgstr "" -#: ../libnm/nm-device-ethernet.c:154 ../libnm/nm-device-infiniband.c:105 -#: ../libnm/nm-device-wifi.c:492 ../libnm/nm-device-wimax.c:311 +#: ../libnm/nm-device-ethernet.c:222 +msgid "The connection and device differ in S390 subchannels." +msgstr "" + +#: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102 +#: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326 msgid "Invalid device MAC address." msgstr "" -#: ../libnm/nm-device-ethernet.c:160 ../libnm/nm-device-infiniband.c:113 -#: ../libnm/nm-device-wifi.c:499 ../libnm/nm-device-wimax.c:318 -msgid "The MACs of the device and the connection didn't match." +#: ../libnm/nm-device-ethernet.c:237 +msgid "The MACs of the device and the connection do not match." +msgstr "" + +#: ../libnm/nm-device-ethernet.c:247 +#, c-format +msgid "Invalid MAC in the blacklist: %s." +msgstr "" + +#: ../libnm/nm-device-ethernet.c:253 +#, c-format +msgid "Device MAC (%s) is blacklisted by the connection." msgstr "" -#: ../libnm/nm-device-generic.c:92 +#: ../libnm/nm-device-generic.c:91 msgid "The connection was not a generic connection." msgstr "" -#: ../libnm/nm-device-generic.c:99 +#: ../libnm/nm-device-generic.c:98 msgid "The connection did not specify an interface name." msgstr "" -#: ../libnm/nm-device-infiniband.c:97 +#: ../libnm/nm-device-tun.c:209 +msgid "The connection was not a tun connection." +msgstr "" + +#: ../libnm/nm-device-tun.c:218 +msgid "The mode of the device and the connection didn't match" +msgstr "" + +#: ../libnm/nm-device-infiniband.c:94 msgid "The connection was not an InfiniBand connection." msgstr "" -#: ../libnm/nm-device-modem.c:123 +#: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611 +#: ../libnm/nm-device-wimax.c:333 +msgid "The MACs of the device and the connection didn't match." +msgstr "" + +#: ../libnm/nm-device-ip-tunnel.c:254 +msgid "The connection was not an IP tunnel connection." +msgstr "" + +#: ../libnm/nm-device-macvlan.c:159 +msgid "The connection was not a MAC-VLAN connection." +msgstr "" + +#: ../libnm/nm-device-modem.c:120 msgid "The connection was not a modem connection." msgstr "" -#: ../libnm/nm-device-modem.c:131 +#: ../libnm/nm-device-modem.c:128 msgid "The connection was not a valid modem connection." msgstr "" -#: ../libnm/nm-device-modem.c:138 +#: ../libnm/nm-device-modem.c:135 msgid "The device is lacking capabilities required by the connection." msgstr "" -#: ../libnm/nm-device-olpc-mesh.c:118 +#: ../libnm/nm-device-olpc-mesh.c:115 msgid "The connection was not an OLPC Mesh connection." msgstr "" -#: ../libnm/nm-device-team.c:121 +#: ../libnm/nm-device-team.c:118 msgid "The connection was not a team connection." msgstr "" -#: ../libnm/nm-device-vlan.c:131 +#: ../libnm/nm-device-vlan.c:128 msgid "The connection was not a VLAN connection." msgstr "" -#: ../libnm/nm-device-vlan.c:138 +#: ../libnm/nm-device-vlan.c:135 msgid "The VLAN identifiers of the device and the connection didn't match." msgstr "" -#: ../libnm/nm-device-vlan.c:151 +#: ../libnm/nm-device-vlan.c:148 msgid "The hardware address of the device and the connection didn't match." msgstr "" -#: ../libnm/nm-device-wifi.c:483 +#: ../libnm/nm-device-vxlan.c:387 +msgid "The connection was not a VXLAN connection." +msgstr "" + +#: ../libnm/nm-device-vxlan.c:394 +msgid "The VXLAN identifiers of the device and the connection didn't match." +msgstr "" + +#: ../libnm/nm-device-wifi.c:595 msgid "The connection was not a Wi-Fi connection." msgstr "" -#: ../libnm/nm-device-wifi.c:519 +#: ../libnm/nm-device-wifi.c:631 msgid "The device is lacking WPA capabilities required by the connection." msgstr "" -#: ../libnm/nm-device-wifi.c:526 +#: ../libnm/nm-device-wifi.c:638 msgid "" "The device is lacking WPA2/RSN capabilities required by the connection." msgstr "" -#: ../libnm/nm-device-wimax.c:302 +#: ../libnm/nm-device-wimax.c:317 msgid "The connection was not a WiMAX connection." msgstr "" -#: ../libnm/nm-device.c:2136 +#: ../libnm/nm-device.c:2729 #, c-format msgid "The connection was not valid: %s" msgstr "" -#: ../libnm/nm-device.c:2145 +#: ../libnm/nm-device.c:2738 #, c-format msgid "The interface names of the device and the connection didn't match." msgstr "" -#: ../libnm/nm-manager.c:858 +#: ../libnm/nm-manager.c:874 msgid "Active connection could not be attached to the device" msgstr "" -#: ../libnm/nm-manager.c:1082 +#: ../libnm/nm-manager.c:1098 msgid "Active connection removed before it was initialized" msgstr "" -#: ../libnm/nm-object.c:1442 ../libnm/nm-object.c:1588 +#: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691 msgid "Caller did not specify D-Bus path for object" msgstr "" @@ -7001,7 +8373,7 @@ msgid "Connection removed before it was initialized" msgstr "" -#: ../libnm/nm-vpn-plugin-old.c:885 +#: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978 msgid "No service name specified" msgstr "" @@ -7098,51 +8470,100 @@ msgid "System policy prevents modification of the persistent system hostname" msgstr "" +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23 +msgid "Modify persistent global DNS configuration" +msgstr "" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24 +msgid "" +"System policy prevents modification of the persistent global DNS " +"configuration" +msgstr "" + +#: ../shared/nm-shared-utils.c:174 +#, c-format +msgid "object class '%s' has no property named '%s'" +msgstr "" + +#: ../shared/nm-shared-utils.c:181 +#, c-format +msgid "property '%s' of object class '%s' is not writable" +msgstr "" + +#: ../shared/nm-shared-utils.c:188 +#, c-format +msgid "" +"construct property \"%s\" for object '%s' can't be set after construction" +msgstr "" + +#: ../shared/nm-shared-utils.c:196 +#, c-format +msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" +msgstr "" + +#: ../shared/nm-shared-utils.c:205 +#, c-format +msgid "unable to set property '%s' of type '%s' from value of type '%s'" +msgstr "" + +#: ../shared/nm-shared-utils.c:216 +#, c-format +msgid "" +"value \"%s\" of type '%s' is invalid or out of range for property '%s' of " +"type '%s'" +msgstr "" + #. Translators: the first %s is a prefix for the connection id, such #. * as "Wired Connection" or "VPN Connection". The %d is a number #. * that is combined with the first argument to create a unique #. * connection id. -#: ../src/NetworkManagerUtils.c:1660 +#: ../src/NetworkManagerUtils.c:111 #, c-format msgctxt "connection id fallback" msgid "%s %d" msgstr "" -#: ../src/main.c:360 -msgid "Print NetworkManager version and exit" +#: ../src/main.c:220 ../src/main.c:358 +#, c-format +msgid "Failed to read configuration: %s\n" msgstr "" -#: ../src/main.c:361 -msgid "Don't become a daemon" +#. Logging/debugging +#: ../src/main.c:234 ../src/nm-iface-helper.c:297 +msgid "Print NetworkManager version and exit" msgstr "" -#: ../src/main.c:362 -msgid "Don't become a daemon, and log to stderr" +#: ../src/main.c:235 ../src/nm-iface-helper.c:298 +msgid "Don't become a daemon" msgstr "" -#: ../src/main.c:363 +#: ../src/main.c:236 ../src/nm-iface-helper.c:300 #, c-format msgid "Log level: one of [%s]" msgstr "" -#: ../src/main.c:365 +#: ../src/main.c:238 ../src/nm-iface-helper.c:302 #, c-format msgid "Log domains separated by ',': any combination of [%s]" msgstr "" -#: ../src/main.c:367 +#: ../src/main.c:240 ../src/nm-iface-helper.c:304 msgid "Make all warnings fatal" msgstr "" -#: ../src/main.c:368 +#: ../src/main.c:241 msgid "Specify the location of a PID file" msgstr "" -#: ../src/main.c:369 +#: ../src/main.c:242 msgid "State file location" msgstr "" -#: ../src/main.c:423 +#: ../src/main.c:244 +msgid "Print NetworkManager configuration and exit" +msgstr "" + +#: ../src/main.c:254 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -7150,481 +8571,490 @@ "should associate with." msgstr "" -#: ../src/main.c:429 ../src/main.c:445 +#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "" -#: ../src/main.c:450 +#: ../src/main.c:348 ../src/nm-iface-helper.c:397 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n" msgstr "" -#: ../src/main.c:501 -#, c-format -msgid "Failed to read configuration: (%d) %s\n" -msgstr "" - -#: ../src/main.c:515 +#: ../src/main.c:373 #, c-format msgid "Error in configuration file: %s.\n" msgstr "" -#: ../src/main.c:520 +#: ../src/main.c:378 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n" msgstr "" -#: ../src/main.c:541 +#: ../src/main.c:389 ../src/nm-iface-helper.c:407 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "" -#: ../src/main.c:153 +#: ../src/main-utils.c:99 #, c-format msgid "Opening %s failed: %s\n" msgstr "" -#: ../src/main.c:159 +#: ../src/main-utils.c:105 #, c-format msgid "Writing to %s failed: %s\n" msgstr "" -#: ../src/main.c:164 +#: ../src/main-utils.c:110 #, c-format msgid "Closing %s failed: %s\n" msgstr "" -#: ../src/main-utils.c:122 +#: ../src/main-utils.c:145 #, c-format msgid "Cannot create '%s': %s" msgstr "" -#: ../src/main-utils.c:174 +#: ../src/main-utils.c:197 #, c-format msgid "%s is already running (pid %ld)\n" msgstr "" -#: ../src/main-utils.c:184 +#: ../src/main-utils.c:207 #, c-format msgid "You must be root to run %s!\n" msgstr "" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:140 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213 msgid "# Created by NetworkManager\n" msgstr "" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:147 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220 #, c-format msgid "" "# Merged from %s\n" "\n" msgstr "" -#: ../src/dhcp-manager/nm-dhcp-manager.c:130 -#, c-format -msgid "'%s' support not found or not enabled." -msgstr "" - -#: ../src/dhcp-manager/nm-dhcp-manager.c:311 -msgid "no usable DHCP client could be found." -msgstr "" - -#: ../src/dns-manager/nm-dns-manager.c:385 -msgid "NOTE: the libc resolver may not support more than 3 nameservers." -msgstr "" - -#: ../src/dns-manager/nm-dns-manager.c:387 -msgid "The nameservers listed below may not be recognized." -msgstr "" - -#: ../src/devices/adsl/nm-device-adsl.c:129 +#: ../src/devices/adsl/nm-device-adsl.c:133 msgid "ADSL connection" msgstr "" -#: ../src/devices/bluetooth/nm-bluez-device.c:194 +#: ../src/devices/bluetooth/nm-bluez-device.c:197 #, c-format msgid "%s Network" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:255 +#: ../src/devices/bluetooth/nm-device-bt.c:253 msgid "PAN requested, but Bluetooth device does not support NAP" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:265 +#: ../src/devices/bluetooth/nm-device-bt.c:263 msgid "PAN connections cannot specify GSM, CDMA, or serial settings" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:278 +#: ../src/devices/bluetooth/nm-device-bt.c:276 msgid "PAN connection" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:285 +#: ../src/devices/bluetooth/nm-device-bt.c:283 msgid "DUN requested, but Bluetooth device does not support DUN" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:295 +#: ../src/devices/bluetooth/nm-device-bt.c:293 msgid "DUN connection must include a GSM or CDMA setting" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:305 -#: ../src/devices/wwan/nm-modem-broadband.c:540 +#: ../src/devices/bluetooth/nm-device-bt.c:303 +#: ../src/devices/wwan/nm-modem-broadband.c:655 msgid "GSM connection" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:309 -#: ../src/devices/wwan/nm-modem-broadband.c:563 +#: ../src/devices/bluetooth/nm-device-bt.c:307 +#: ../src/devices/wwan/nm-modem-broadband.c:679 msgid "CDMA connection" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:317 +#: ../src/devices/bluetooth/nm-device-bt.c:315 msgid "Unknown/unhandled Bluetooth connection type" msgstr "" -#: ../src/devices/bluetooth/nm-device-bt.c:337 -#: ../src/devices/nm-device-ethernet.c:1417 -#: ../src/devices/nm-device-infiniband.c:204 -#: ../src/devices/wifi/nm-device-wifi.c:1103 -#: ../src/devices/wimax/nm-device-wimax.c:454 +#: ../src/devices/bluetooth/nm-device-bt.c:336 +#: ../src/devices/nm-device-ethernet.c:1415 +#: ../src/devices/nm-device-infiniband.c:192 +#: ../src/devices/wifi/nm-device-wifi.c:825 msgid "connection does not match device" msgstr "" -#: ../src/devices/nm-device-bond.c:124 +#: ../src/devices/nm-device-bond.c:105 msgid "Bond connection" msgstr "" -#: ../src/devices/nm-device-bridge.c:130 +#: ../src/devices/nm-device-bridge.c:111 msgid "Bridge connection" msgstr "" -#: ../src/devices/nm-device-ethernet.c:1398 +#: ../src/devices/nm-device-ethernet.c:1396 msgid "PPPoE connection" msgstr "" -#: ../src/devices/nm-device-ethernet.c:1398 +#: ../src/devices/nm-device-ethernet.c:1396 msgid "Wired connection" msgstr "" -#: ../src/devices/nm-device-ethernet.c:1528 -#: ../src/settings/nm-settings-utils.c:50 +#: ../src/devices/nm-device-ethernet-utils.c:39 #, c-format msgid "Wired connection %d" msgstr "" -#: ../src/devices/nm-device-infiniband.c:186 +#: ../src/devices/nm-device-infiniband.c:174 msgid "InfiniBand connection" msgstr "" -#: ../src/devices/nm-device-vlan.c:306 +#: ../src/devices/nm-device-ip-tunnel.c:346 +msgid "IP tunnel connection" +msgstr "" + +#: ../src/devices/nm-device-macvlan.c:428 +msgid "MACVLAN connection" +msgstr "" + +#: ../src/devices/nm-device-tun.c:129 +msgid "TUN connection" +msgstr "" + +#: ../src/devices/nm-device-vlan.c:447 msgid "VLAN connection" msgstr "" -#: ../src/devices/team/nm-device-team.c:133 -msgid "Team connection" +#: ../src/devices/nm-device-vxlan.c:373 +msgid "VXLAN connection" msgstr "" -#: ../src/devices/wifi/nm-device-olpc-mesh.c:151 -msgid "Mesh" +#: ../src/devices/team/nm-device-team.c:115 +msgid "Team connection" msgstr "" -#: ../src/devices/wifi/nm-device-wifi.c:1071 -msgid "WPA Ad-Hoc disabled due to kernel bugs" +#: ../src/devices/wifi/nm-device-olpc-mesh.c:146 +msgid "Mesh" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:44 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:42 #, c-format msgid "%s is incompatible with static WEP keys" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:78 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:76 msgid "LEAP authentication requires a LEAP username" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:88 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:86 msgid "LEAP username requires 'leap' authentication" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:101 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:99 msgid "LEAP authentication requires IEEE 802.1x key management" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:121 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:119 msgid "LEAP authentication is incompatible with Ad-Hoc mode" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:133 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:131 msgid "LEAP authentication is incompatible with 802.1x setting" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:155 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:153 #, c-format msgid "a connection using '%s' authentication cannot use WPA key management" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:166 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:164 #, c-format -msgid "a connection using '%s' authentication cannot specific WPA protocols" +msgid "a connection using '%s' authentication cannot specify WPA protocols" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:182 -#: ../src/devices/wifi/nm-wifi-ap-utils.c:199 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:180 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:197 #, c-format -msgid "a connection using '%s' authentication cannot specific WPA ciphers" +msgid "a connection using '%s' authentication cannot specify WPA ciphers" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:211 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:209 #, c-format -msgid "a connection using '%s' authentication cannot specific a WPA password" +msgid "a connection using '%s' authentication cannot specify a WPA password" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:242 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:240 msgid "Dynamic WEP requires an 802.1x setting" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:252 -#: ../src/devices/wifi/nm-wifi-ap-utils.c:280 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:250 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:278 msgid "Dynamic WEP requires 'open' authentication" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:267 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:265 msgid "Dynamic WEP requires 'ieee8021x' key management" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:314 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:312 msgid "WPA-PSK authentication is incompatible with 802.1x" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:324 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:322 msgid "WPA-PSK requires 'open' authentication" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:336 -msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP" +#: ../src/devices/wifi/nm-wifi-ap-utils.c:337 +msgid "WPA Ad-Hoc authentication requires 'rsn' protocol" msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:349 -msgid "WPA Ad-Hoc authentication requires 'wpa' protocol" +msgid "WPA Ad-Hoc authentication requires 'ccmp' pairwise cipher" msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:361 -msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher" -msgstr "" - -#: ../src/devices/wifi/nm-wifi-ap-utils.c:373 -msgid "WPA Ad-Hoc requires 'tkip' group cipher" +msgid "WPA Ad-Hoc requires 'ccmp' group cipher" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:387 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:375 msgid "Access point does not support PSK but setting requires it" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:417 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:405 msgid "WPA-EAP authentication requires an 802.1x setting" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:427 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:415 msgid "WPA-EAP requires 'open' authentication" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:438 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:426 msgid "802.1x setting requires 'wpa-eap' key management" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:451 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:439 msgid "Access point does not support 802.1x but setting requires it" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:479 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:467 msgid "" "Access point mode is Ad-Hoc but setting requires Infrastructure security" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:489 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:477 msgid "Ad-Hoc mode is incompatible with 802.1x security" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:498 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:486 msgid "Ad-Hoc mode is incompatible with LEAP security" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:508 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:496 msgid "Ad-Hoc mode requires 'open' authentication" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:518 -msgid "" -"Access point mode is Infrastructure but setting requires Ad-Hoc security" -msgstr "" - -#: ../src/devices/wifi/nm-wifi-ap-utils.c:560 -#: ../src/devices/wifi/nm-wifi-ap-utils.c:590 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:538 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:568 #, c-format msgid "connection does not match access point" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:614 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:592 msgid "Access point is unencrypted but setting specifies security" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:703 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:681 msgid "" "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic " "WEP" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:713 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:691 msgid "WPA authentication is incompatible with Shared Key authentication" msgstr "" -#: ../src/devices/wifi/nm-wifi-ap-utils.c:760 +#: ../src/devices/wifi/nm-wifi-ap-utils.c:740 msgid "Failed to determine AP security information" msgstr "" -#: ../src/devices/wwan/nm-modem-broadband.c:527 +#: ../src/devices/wwan/nm-modem-broadband.c:641 msgid "GSM mobile broadband connection requires a 'gsm' setting" msgstr "" -#: ../src/config/nm-config.c:281 +#: ../src/nm-config.c:465 msgid "Config file location" msgstr "" -#: ../src/config/nm-config.c:282 +#: ../src/nm-config.c:466 msgid "Config directory location" msgstr "" -#: ../src/nm-config.c:465 +#: ../src/nm-config.c:467 +msgid "System config directory location" +msgstr "" + +#: ../src/nm-config.c:468 +msgid "Internal config file location" +msgstr "" + +#: ../src/nm-config.c:469 msgid "State file for no-auto-default devices" msgstr "" -#: ../src/config/nm-config.c:284 +#: ../src/nm-config.c:470 msgid "List of plugins separated by ','" msgstr "" -#: ../src/nm-config.c:467 +#: ../src/nm-config.c:471 msgid "Quit after initial configuration" msgstr "" +#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299 +msgid "Don't become a daemon, and log to stderr" +msgstr "" + #. These three are hidden for now, and should eventually just go away. -#: ../src/config/nm-config.c:287 +#: ../src/nm-config.c:475 msgid "An http(s) address for checking internet connectivity" msgstr "" -#: ../src/config/nm-config.c:288 +#: ../src/nm-config.c:476 msgid "The interval between connectivity checks (in seconds)" msgstr "" -#: ../src/config/nm-config.c:289 +#: ../src/nm-config.c:477 msgid "The expected start of the response" msgstr "" #. Interface/IP config -#: ../src/nm-iface-helper.c:285 +#: ../src/nm-iface-helper.c:280 msgid "The interface to manage" msgstr "" -#: ../src/nm-iface-helper.c:285 +#: ../src/nm-iface-helper.c:280 msgid "eth0" msgstr "" -#: ../src/nm-iface-helper.c:286 +#: ../src/nm-iface-helper.c:281 msgid "Connection UUID" msgstr "" -#: ../src/nm-iface-helper.c:286 +#: ../src/nm-iface-helper.c:281 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b" msgstr "" -#: ../src/nm-iface-helper.c:287 +#: ../src/nm-iface-helper.c:282 msgid "Whether to manage IPv6 SLAAC" msgstr "" -#: ../src/nm-iface-helper.c:288 +#: ../src/nm-iface-helper.c:283 msgid "Whether SLAAC must be successful" msgstr "" -#: ../src/nm-iface-helper.c:289 +#: ../src/nm-iface-helper.c:284 msgid "Use an IPv6 temporary privacy address" msgstr "" -#: ../src/nm-iface-helper.c:290 +#: ../src/nm-iface-helper.c:285 msgid "Current DHCPv4 address" msgstr "" -#: ../src/nm-iface-helper.c:291 +#: ../src/nm-iface-helper.c:286 msgid "Whether DHCPv4 must be successful" msgstr "" -#: ../src/nm-iface-helper.c:292 +#: ../src/nm-iface-helper.c:287 msgid "Hex-encoded DHCPv4 client ID" msgstr "" -#: ../src/nm-iface-helper.c:293 +#: ../src/nm-iface-helper.c:288 msgid "Hostname to send to DHCP server" msgstr "" -#: ../src/nm-iface-helper.c:293 +#: ../src/nm-iface-helper.c:288 msgid "barbar" msgstr "" -#: ../src/nm-iface-helper.c:294 +#: ../src/nm-iface-helper.c:289 +msgid "FQDN to send to DHCP server" +msgstr "" + +#: ../src/nm-iface-helper.c:289 +msgid "host.domain.org" +msgstr "" + +#: ../src/nm-iface-helper.c:290 msgid "Route priority for IPv4" msgstr "" -#: ../src/nm-iface-helper.c:294 +#: ../src/nm-iface-helper.c:290 msgid "0" msgstr "" -#: ../src/nm-iface-helper.c:295 +#: ../src/nm-iface-helper.c:291 msgid "Route priority for IPv6" msgstr "" -#: ../src/nm-iface-helper.c:295 +#: ../src/nm-iface-helper.c:291 msgid "1024" msgstr "" -#: ../src/nm-iface-helper.c:296 +#: ../src/nm-iface-helper.c:292 msgid "Hex-encoded Interface Identifier" msgstr "" -#: ../src/nm-iface-helper.c:316 +#: ../src/nm-iface-helper.c:293 +msgid "IPv6 SLAAC address generation mode" +msgstr "" + +#: ../src/nm-iface-helper.c:294 +msgid "" +"The logging backend configuration value. See logging.backend in " +"NetworkManager.conf" +msgstr "" + +#: ../src/nm-iface-helper.c:314 msgid "" "nm-iface-helper is a small, standalone process that manages a single network " "interface." msgstr "" -#: ../src/nm-iface-helper.c:364 +#: ../src/nm-iface-helper.c:373 #, c-format msgid "An interface name and UUID are required\n" msgstr "" -#: ../src/nm-iface-helper.c:370 +#: ../src/nm-iface-helper.c:379 #, c-format msgid "Failed to find interface index for %s (%s)\n" msgstr "" -#: ../src/nm-iface-helper.c:430 +#: ../src/nm-iface-helper.c:441 #, c-format msgid "(%s): Invalid IID %s\n" msgstr "" -#: ../src/logging/nm-logging.c:150 +#: ../src/nm-logging.c:216 #, c-format msgid "Unknown log level '%s'" msgstr "" -#: ../src/logging/nm-logging.c:229 +#: ../src/nm-logging.c:309 #, c-format msgid "Unknown log domain '%s'" msgstr "" -#: ../src/nm-manager.c:3433 +#: ../src/nm-manager.c:3678 msgid "VPN connection" msgstr "" -#: ../src/nm-sleep-monitor-systemd.c:117 +#: ../src/nm-sleep-monitor-systemd.c:132 msgid "NetworkManager needs to turn off networks" msgstr "" -#: ../src/settings/plugins/ifcfg-rh/reader.c:113 +#: ../src/settings/plugins/ifcfg-rh/reader.c:108 msgid "System" msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/newt.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/newt.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/newt.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/newt.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:14+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:52+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../dialogboxes.c:49 msgid "Ok" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/notificationhelper.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/notificationhelper.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/notificationhelper.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/notificationhelper.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:04+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:42+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/daemon/apportevent/apportevent.cpp:62 msgctxt "Notification when apport detects a crash" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/nss_db.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/nss_db.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/nss_db.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/nss_db.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:14+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:52+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/makedb.c:68 msgid "Convert key to lower case" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/opcodes.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/opcodes.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/opcodes.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/opcodes.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 11:19+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 04:53+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. Invalid option. #. XXX - should break 'option' at following delimiter. diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/p11-kit.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/p11-kit.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/p11-kit.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/p11-kit.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:21+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:57+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: p11-kit/messages.c:78 msgid "The operation was cancelled" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/pastebinit.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/pastebinit.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/pastebinit.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/pastebinit.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:24+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:04+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../pastebinit:105 msgid "%s: no section [pastebin]" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/pbbuttonsd.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/pbbuttonsd.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/pbbuttonsd.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/pbbuttonsd.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:46+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:26+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/init.c:187 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/polkit-1.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/polkit-1.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/polkit-1.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/polkit-1.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:57+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:34+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../actions/org.freedesktop.policykit.policy.in.h:1 msgid "Run programs as another user" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/pulseaudio.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/pulseaudio.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/pulseaudio.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/pulseaudio.po 2016-04-15 08:51:13.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: pulseaudio\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-21 11:07+0000\n" +"POT-Creation-Date: 2016-03-21 10:46+0000\n" "PO-Revision-Date: 2013-04-18 09:12+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:22+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:02+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../src/daemon/cmdline.c:111 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/python-apt.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/python-apt.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/python-apt.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/python-apt.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:24+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:03+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/quota.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/quota.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/quota.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/quota.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:24+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:03+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: bylabel.c:253 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/rpm.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/rpm.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/rpm.po 2016-03-22 15:09:37.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/rpm.po 2016-04-15 08:51:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:16+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 05:54+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: cliutils.c:21 lib/poptI.c:29 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/screen-resolution-extra.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/screen-resolution-extra.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/screen-resolution-extra.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/screen-resolution-extra.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:50+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:27+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../ScreenResolution/ui.py:60 msgid "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/sed.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/sed.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/sed.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/sed.po 2016-04-15 08:51:15.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:26+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:05+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: sed/compile.c:144 msgid "multiple `!'s" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/software-properties.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/software-properties.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/software-properties.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/software-properties.po 2016-04-15 08:51:12.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: software-properties\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-16 14:43+0000\n" +"POT-Creation-Date: 2016-03-22 07:57+0000\n" "PO-Revision-Date: 2016-02-26 14:08+0000\n" "Last-Translator: ANyarThar <phoehtt@gmail.com>\n" "Language-Team: Burmese <my@li.org>\n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 13:25+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:05+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../data/com.ubuntu.softwareproperties.policy.in.h:1 msgid "Write Configuration" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/sudo.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/sudo.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/sudo.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/sudo.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:27+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:06+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: common/aix.c:93 common/aix.c:150 msgid "unable to open userdb" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/sysstat.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/sysstat.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/sysstat.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/sysstat.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:47+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:27+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: cifsiostat.c:70 mpstat.c:98 pidstat.c:87 iostat.c:86 tapestat.c:89 sar.c:95 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/system-service.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/system-service.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/system-service.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/system-service.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:29+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../backend/com.ubuntu.systemservice.policy.in.h:1 msgid "Get current global proxy" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/tmispell-voikko.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/tmispell-voikko.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/tmispell-voikko.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/tmispell-voikko.po 2016-04-15 08:51:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:23+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:03+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/charset.cc:73 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/trust-store.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/trust-store.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/trust-store.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/trust-store.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# Burmese translation for trust-store -# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015 -# This file is distributed under the same license as the trust-store package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. -# -msgid "" -msgstr "" -"Project-Id-Version: trust-store\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-01-12 21:03+0100\n" -"PO-Revision-Date: 2015-07-25 07:12+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: Burmese <my@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:50+0000\n" -"X-Generator: Launchpad (build 17958)\n" - -#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/daemon.cpp:266 -msgid "is trying to access" -msgstr "" - -#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/mir/prompt_main.qml:78 -msgid "Allow" -msgstr "ခွင့်ပြု" - -#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/mir/prompt_main.qml:83 -msgid "Don’t Allow" -msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-help.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-help.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-help.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-help.po 2016-04-15 08:51:12.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-docs\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-18 23:26+0100\n" +"POT-Creation-Date: 2016-04-08 10:15+0000\n" "PO-Revision-Date: 2013-04-20 09:03+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:48+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:29+0000\n" +"X-Generator: Launchpad (build 17995)\n" #. (itstool) path: p/link #: C/legal.xml:3 @@ -203,10 +203,10 @@ #: C/color-howtoimport.page:21 #: C/color-virtualdevice.page:19 #: C/contacts-add-remove.page:17 -#: C/contacts-connect.page:14 +#: C/contacts-connect.page:10 #: C/contacts-edit-details.page:18 #: C/contacts-link-unlink.page:17 -#: C/contacts.page:13 +#: C/contacts.page:14 #: C/contacts-search.page:18 #: C/contacts-setup.page:7 #: C/clock-calendar.page:20 @@ -244,10 +244,10 @@ #: C/files-tilde.page:18 #: C/keyboard-cursor-blink.page:26 #: C/keyboard-layouts.page:22 -#: C/keyboard-nav.page:12 +#: C/keyboard-nav.page:10 #: C/keyboard-osk.page:19 #: C/keyboard-repeat-keys.page:24 -#: C/keyboard-shortcuts-set.page:12 +#: C/keyboard-shortcuts-set.page:10 #: C/look-background.page:34 #: C/look-display-fuzzy.page:26 #: C/look-resolution.page:23 @@ -287,7 +287,7 @@ #: C/wacom-left-handed.page:7 #: C/wacom-mode.page:6 #: C/wacom-multi-monitor.page:7 -#: C/wacom.page:13 +#: C/wacom.page:15 #: C/wacom-stylus.page:7 msgid "Michael Hill" msgstr "Michael Hill" @@ -654,8 +654,8 @@ #. (itstool) path: credit/years #: C/a11y-right-click.page:13 #: C/accounts-whyadd.page:7 -#: C/contacts-connect.page:16 -#: C/contacts.page:15 +#: C/contacts-connect.page:12 +#: C/contacts.page:16 #: C/contacts-setup.page:9 #: C/documents-collections.page:9 #: C/documents-collections.page:14 @@ -1068,7 +1068,7 @@ #: C/hardware-driver-proprietary.page:13 #: C/keyboard.page:23 #: C/keyboard-layouts.page:30 -#: C/keyboard-nav.page:16 +#: C/keyboard-nav.page:14 #: C/nautilus-display.page:22 #: C/net-antivirus.page:19 #: C/net-chat-empathy.page:11 @@ -1603,18 +1603,18 @@ msgstr "Susanna Huhtanen" #. (itstool) path: info/desc -#: C/accounts-whyadd.page:23 +#: C/accounts-whyadd.page:24 msgid "Why add your email or social media accounts to your desktop?" msgstr "" "သင်၏ Desktop ထဲသို့ အီးမေးလ်နှင့် Social Media အကောင့်များဘာလို့ထည့်သလဲ။" #. (itstool) path: page/title -#: C/accounts-whyadd.page:28 +#: C/accounts-whyadd.page:29 msgid "Why should I add an account?" msgstr "အကောင့်တစ်ခုကိုဘာကြောင့်ထည့်သင့်သလဲ။" #. (itstool) path: page/p -#: C/accounts-whyadd.page:32 +#: C/accounts-whyadd.page:33 msgid "" "Adding your accounts brings a choice of services like calendar, chat, and e-" "mail straight to your desktop, making services a seamless part of your user " @@ -1624,27 +1624,20 @@ "added will be ready for you." msgstr "" -#. (itstool) path: license/p -#: C/addremove-install-synaptic.page:20 -msgid "" -"<link href=\"http://creativecommons.org/licenses/by-sa/3.0/\"> Creative " -"Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>." -msgstr "" - #. (itstool) path: info/desc -#: C/addremove-install-synaptic.page:26 +#: C/addremove-install-synaptic.page:20 msgid "" "Synaptic is a powerful but complicated software management alternative to " "<app>Software</app>." msgstr "" #. (itstool) path: page/title -#: C/addremove-install-synaptic.page:32 +#: C/addremove-install-synaptic.page:26 msgid "Use Synaptic for more advanced software management" msgstr "" #. (itstool) path: page/p -#: C/addremove-install-synaptic.page:36 +#: C/addremove-install-synaptic.page:30 msgid "" "<app>Synaptic Package Manager</app> is more powerful and can do some " "software management tasks which <app>Software</app> can't. Synaptic's " @@ -1654,33 +1647,33 @@ msgstr "" #. (itstool) path: page/p -#: C/addremove-install-synaptic.page:44 +#: C/addremove-install-synaptic.page:38 msgid "" "Synaptic isn't installed by default, but you can <link " "href=\"apt:synaptic\">install</link> it with <app>Software</app>." msgstr "" #. (itstool) path: section/title -#: C/addremove-install-synaptic.page:50 +#: C/addremove-install-synaptic.page:44 msgid "Install software with Synaptic" msgstr "Synaptic နှင့်ဆော့ဝဲလ်များကိုသွင်းမည်" #. (itstool) path: item/p -#: C/addremove-install-synaptic.page:55 +#: C/addremove-install-synaptic.page:49 msgid "" "Open Synaptic from the <gui>Dash</gui> or the <gui>Launcher</gui>. You will " "need to enter your password in the <gui>Authenticate</gui> window." msgstr "" #. (itstool) path: item/p -#: C/addremove-install-synaptic.page:61 +#: C/addremove-install-synaptic.page:55 msgid "" "Click <gui>Search</gui> to search for an application, or click " "<gui>Sections</gui> and look through the categories to find one." msgstr "" #. (itstool) path: item/p -#: C/addremove-install-synaptic.page:67 +#: C/addremove-install-synaptic.page:61 msgid "" "Right-click the application that you want to install and select <gui>Mark " "for Installation</gui>." @@ -1689,24 +1682,24 @@ "Installation</gui> ကိုရွေးပါ" #. (itstool) path: item/p -#: C/addremove-install-synaptic.page:73 +#: C/addremove-install-synaptic.page:67 msgid "If you are asked to mark additional changes, click <gui>Mark</gui>." msgstr "" #. (itstool) path: item/p -#: C/addremove-install-synaptic.page:78 +#: C/addremove-install-synaptic.page:72 msgid "Select any other applications that you would like to install." msgstr "သင်သွင်းချင်သော တခြား application များကိုလည်းရွေးပါ" #. (itstool) path: item/p -#: C/addremove-install-synaptic.page:83 +#: C/addremove-install-synaptic.page:77 msgid "" "Click <gui>Apply</gui>, and then click <gui>Apply</gui> in the window that " "appears. The applications that you chose will be downloaded and installed." msgstr "" #. (itstool) path: section/p -#: C/addremove-install-synaptic.page:91 +#: C/addremove-install-synaptic.page:85 msgid "" "For more information about using <app>Synaptic</app>, consult the <link " "href=\"https://help.ubuntu.com/community/SynapticHowto\">Synaptic How " @@ -4370,7 +4363,7 @@ #. (itstool) path: credit/name #: C/contacts-add-remove.page:21 -#: C/contacts-connect.page:19 +#: C/contacts-connect.page:15 #: C/contacts-edit-details.page:22 #: C/contacts-link-unlink.page:21 #: C/contacts-search.page:22 @@ -4450,7 +4443,7 @@ msgstr "" #. (itstool) path: credit/years -#: C/contacts-connect.page:21 +#: C/contacts-connect.page:17 #: C/display-dual-monitors-desktop.page:13 #: C/printing-cancel-job.page:26 #: C/printing-setup-default-printer.page:25 @@ -4607,17 +4600,17 @@ msgstr "" #. (itstool) path: info/desc -#: C/contacts.page:18 +#: C/contacts.page:19 msgid "Access your contacts." msgstr "" #. (itstool) path: page/title -#: C/contacts.page:22 +#: C/contacts.page:23 msgid "Contacts" msgstr "" #. (itstool) path: page/p -#: C/contacts.page:24 +#: C/contacts.page:25 msgid "" "Use <app>Contacts</app> to store, access or edit information for your " "contacts, locally or in your <link xref=\"accounts\">Online Accounts</link>." @@ -4679,19 +4672,19 @@ msgstr "" #. (itstool) path: page/title -#: C/contacts-setup.page:19 +#: C/contacts-setup.page:20 msgid "Starting Contacts for the first time" msgstr "" #. (itstool) path: page/p -#: C/contacts-setup.page:27 +#: C/contacts-setup.page:28 msgid "" "When you run <app>Contacts</app> for the first time, the <gui>Contacts " "Setup</gui> window opens." msgstr "" #. (itstool) path: page/p -#: C/contacts-setup.page:30 +#: C/contacts-setup.page:31 msgid "" "If you have <link xref=\"accounts\">online accounts</link> configured, they " "are listed with <gui>Local Address Book</gui>. Select an item from the list " @@ -4699,14 +4692,14 @@ msgstr "" #. (itstool) path: note/p -#: C/contacts-setup.page:35 +#: C/contacts-setup.page:36 msgid "" "Click the <gui style=\"button\">Online Account Settings</gui> to edit " "existing account settings." msgstr "" #. (itstool) path: page/p -#: C/contacts-setup.page:39 +#: C/contacts-setup.page:40 msgid "" "If you have no online accounts configured, click <gui " "style=\"button\">Online Accounts</gui> to begin the setup. If you don't wish " @@ -4860,7 +4853,7 @@ #: C/keyboard-layouts.page:166 #: C/keyboard-osk.page:34 #: C/keyboard-repeat-keys.page:42 -#: C/keyboard-shortcuts-set.page:41 +#: C/keyboard-shortcuts-set.page:44 #: C/net-proxy.page:50 #: C/net-wireless-adhoc.page:43 #: C/prefs-language-install.page:25 @@ -5804,7 +5797,7 @@ #: C/keyboard-layouts.page:18 #: C/keyboard-osk.page:15 #: C/keyboard-repeat-keys.page:20 -#: C/keyboard-shortcuts-set.page:16 +#: C/keyboard-shortcuts-set.page:14 msgid "Julita Inca" msgstr "Julita Inca" @@ -5814,12 +5807,12 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-collections.page:24 +#: C/documents-collections.page:25 msgid "Make collections of documents" msgstr "" #. (itstool) path: page/p -#: C/documents-collections.page:37 +#: C/documents-collections.page:38 msgid "" "<app>Documents</app> lets you put together documents of different types in " "one place called a <em>collection</em>. If you have documents that are " @@ -5830,30 +5823,30 @@ msgstr "" #. (itstool) path: page/p -#: C/documents-collections.page:44 +#: C/documents-collections.page:45 msgid "To create or add to a collection:" msgstr "" #. (itstool) path: item/p -#: C/documents-collections.page:46 -#: C/documents-collections.page:61 -#: C/documents-print.page:37 -#: C/documents-select.page:37 +#: C/documents-collections.page:47 +#: C/documents-collections.page:62 +#: C/documents-print.page:38 +#: C/documents-select.page:38 msgid "Click the <gui>✓</gui> button." msgstr "" #. (itstool) path: item/p -#: C/documents-collections.page:47 +#: C/documents-collections.page:48 msgid "In selection mode, check the documents to be collected." msgstr "" #. (itstool) path: item/p -#: C/documents-collections.page:48 +#: C/documents-collections.page:49 msgid "Click the <gui>+</gui> button in the button bar." msgstr "" #. (itstool) path: item/p -#: C/documents-collections.page:49 +#: C/documents-collections.page:50 msgid "" "In the collection list, click <gui>Add</gui> and type a new collection name, " "or select an existing collection. The selected documents will be added to " @@ -5861,24 +5854,24 @@ msgstr "" #. (itstool) path: note/p -#: C/documents-collections.page:55 +#: C/documents-collections.page:56 msgid "" "Collections do not behave like folders and their hierarchy: <em>you cannot " "put collections inside collections.</em>" msgstr "" #. (itstool) path: page/p -#: C/documents-collections.page:59 +#: C/documents-collections.page:60 msgid "To delete a collection:" msgstr "" #. (itstool) path: item/p -#: C/documents-collections.page:62 +#: C/documents-collections.page:63 msgid "In selection mode, check the collection to be deleted." msgstr "" #. (itstool) path: item/p -#: C/documents-collections.page:63 +#: C/documents-collections.page:64 msgid "" "Click the Trash button in the button bar. The collection will be deleted, " "leaving the original documents." @@ -5890,7 +5883,7 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-filter.page:19 +#: C/documents-filter.page:20 msgid "Filter documents" msgstr "" @@ -5899,8 +5892,8 @@ #. the file changes, the md5 hash will change to let you know you need to #. update your localized copy. The msgstr is not used at all. Set it to #. whatever you like once you have updated your copy of the file. -#: C/documents-filter.page:21 -#: C/documents-search.page:45 +#: C/documents-filter.page:22 +#: C/documents-search.page:46 #: C/files-browse.page:80 #: C/files-hidden.page:42 #: C/files-hidden.page:48 @@ -5920,7 +5913,7 @@ msgstr "" #. (itstool) path: page/p -#: C/documents-filter.page:21 +#: C/documents-filter.page:22 msgid "" "Click the <media type=\"image\" src=\"figures/go-down.png\">down</media> " "button next to the <link xref=\"documents-search\">search</link> bar to " @@ -5928,24 +5921,24 @@ msgstr "" #. (itstool) path: item/p -#: C/documents-filter.page:26 +#: C/documents-filter.page:27 msgid "<em>Sources</em>: Local, Google, SkyDrive, or All." msgstr "" #. (itstool) path: item/p -#: C/documents-filter.page:27 +#: C/documents-filter.page:28 msgid "" "<em>Type</em>: Collections, PDF Documents, Presentations, Spreadsheets, Text " "Documents, or All." msgstr "" #. (itstool) path: item/p -#: C/documents-filter.page:29 +#: C/documents-filter.page:30 msgid "Title, Author, or All." msgstr "" #. (itstool) path: note/p -#: C/documents-filter.page:32 +#: C/documents-filter.page:33 msgid "" "In order for <gui>Google</gui> or <gui>SkyDrive</gui> to appear in the " "filter list, it is necessary to configure Google or Windows Live as an <link " @@ -5958,12 +5951,12 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-formats.page:19 +#: C/documents-formats.page:20 msgid "Formats supported" msgstr "" #. (itstool) path: page/p -#: C/documents-formats.page:27 +#: C/documents-formats.page:28 msgid "" "<app>Documents</app> displays PDF, DVI, XPS, PostScript and the formats " "supported by <app>Document Viewer</app> (Evince), <app>Microsoft " @@ -6059,13 +6052,13 @@ #. (itstool) path: page/title #. (itstool) path: section/title -#: C/documents.page:24 +#: C/documents.page:25 #: C/files.page:57 msgid "Documents" msgstr "" #. (itstool) path: page/p -#: C/documents.page:36 +#: C/documents.page:37 msgid "" "<app>Documents</app> is a GNOME application that lets you display, organize, " "and print the documents on your computer or those created remotely using " @@ -6073,17 +6066,17 @@ msgstr "" #. (itstool) path: section/title -#: C/documents.page:41 +#: C/documents.page:42 msgid "View, Sort and Search" msgstr "" #. (itstool) path: section/title -#: C/documents.page:45 +#: C/documents.page:46 msgid "Select, Organize, Print" msgstr "" #. (itstool) path: section/title -#: C/documents.page:49 +#: C/documents.page:50 msgid "Questions" msgstr "" @@ -6093,12 +6086,12 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-previews.page:24 +#: C/documents-previews.page:25 msgid "Why don't some files have previews?" msgstr "" #. (itstool) path: page/p -#: C/documents-previews.page:32 +#: C/documents-previews.page:33 msgid "" "When you open <app>Documents</app>, a preview thumbnail is displayed for " "documents that are stored locally. Those stored on a remote server like " @@ -6107,14 +6100,14 @@ msgstr "" #. (itstool) path: page/p -#: C/documents-previews.page:36 +#: C/documents-previews.page:37 msgid "" "If you download a <em>Google Docs</em> or <em>SkyDrive</em> document to " "local storage, a thumbnail will be generated." msgstr "" #. (itstool) path: note/p -#: C/documents-previews.page:40 +#: C/documents-previews.page:41 msgid "" "The local copy of a document downloaded from <em>Google Docs</em> or " "<em>SkyDrive</em> will lose its ability to be updated online. If you want to " @@ -6127,28 +6120,28 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-print.page:24 +#: C/documents-print.page:25 msgid "Print a document" msgstr "" #. (itstool) path: page/p -#: C/documents-print.page:34 +#: C/documents-print.page:35 msgid "To print a document:" msgstr "" #. (itstool) path: item/p -#: C/documents-print.page:38 +#: C/documents-print.page:39 msgid "In selection mode, check the document to be printed." msgstr "" #. (itstool) path: item/p -#: C/documents-print.page:39 +#: C/documents-print.page:40 msgid "" "Click the Print button in the button bar. The <gui>Print</gui> dialog opens." msgstr "" #. (itstool) path: note/p -#: C/documents-print.page:44 +#: C/documents-print.page:45 msgid "" "Printing is not available when more than one document is selected, or when a " "collection is selected." @@ -6160,33 +6153,33 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-search.page:24 +#: C/documents-search.page:25 #: C/files-search.page:29 msgid "Search for files" msgstr "" #. (itstool) path: page/p -#: C/documents-search.page:36 +#: C/documents-search.page:37 msgid "To start a search in <app>Documents</app>:" msgstr "" #. (itstool) path: item/p -#: C/documents-search.page:39 +#: C/documents-search.page:40 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>." msgstr "" #. (itstool) path: item/p -#: C/documents-search.page:40 +#: C/documents-search.page:41 msgid "Click the magnifying glass icon." msgstr "" #. (itstool) path: item/p -#: C/documents-search.page:41 +#: C/documents-search.page:42 msgid "Start typing. Documents will match by title or author." msgstr "" #. (itstool) path: note/p -#: C/documents-search.page:44 +#: C/documents-search.page:45 msgid "" "You can restrict or filter the search results by clicking the <media " "type=\"image\" src=\"figures/go-down.png\">down</media> button and selecting " @@ -6199,60 +6192,60 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-select.page:24 +#: C/documents-select.page:25 msgid "Selecting documents" msgstr "" #. (itstool) path: page/p -#: C/documents-select.page:33 +#: C/documents-select.page:34 msgid "" "From <app>Documents</app> selection mode you can open, print, view or make " "collections of your documents. To use selection mode:" msgstr "" #. (itstool) path: item/p -#: C/documents-select.page:38 +#: C/documents-select.page:39 msgid "" "Select one or more documents or collections. The button bar appears with the " "actions that are valid for your selection." msgstr "" #. (itstool) path: section/title -#: C/documents-select.page:44 +#: C/documents-select.page:45 msgid "Selection mode actions" msgstr "" #. (itstool) path: section/p -#: C/documents-select.page:46 +#: C/documents-select.page:47 msgid "After selecting one or more documents you can:" msgstr "" #. (itstool) path: item/p -#: C/documents-select.page:49 +#: C/documents-select.page:50 msgid "Open with Document Viewer (folder icon)." msgstr "" #. (itstool) path: item/p -#: C/documents-select.page:50 +#: C/documents-select.page:51 msgid "" "Print (printer icon): print a document (only available when a single " "document is selected)." msgstr "" #. (itstool) path: item/p -#: C/documents-select.page:52 +#: C/documents-select.page:53 msgid "Organize (plus icon): create a collection of documents." msgstr "" #. (itstool) path: item/p -#: C/documents-select.page:53 +#: C/documents-select.page:54 msgid "" "Properties (wrench icon): display the properties of a document (only " "available when a single document is selected)." msgstr "" #. (itstool) path: item/p -#: C/documents-select.page:55 +#: C/documents-select.page:56 msgid "Delete (trash icon): delete one or more collections." msgstr "" @@ -6262,12 +6255,12 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-tracker.page:24 +#: C/documents-tracker.page:25 msgid "My documents cannot be seen" msgstr "" #. (itstool) path: page/p -#: C/documents-tracker.page:38 +#: C/documents-tracker.page:39 msgid "" "If your documents fail to display in <app>Documents</app>, " "<app>Tracker</app> may not be running or properly configured. Make sure " @@ -6325,19 +6318,19 @@ msgstr "" #. (itstool) path: page/title -#: C/documents-view.page:24 +#: C/documents-view.page:25 msgid "Display documents stored locally or online" msgstr "" #. (itstool) path: page/p -#: C/documents-view.page:34 +#: C/documents-view.page:35 msgid "" "When you open <app>Documents</app>, all of your documents, those stored " "locally as well as online, are displayed as thumbnails." msgstr "" #. (itstool) path: note/p -#: C/documents-view.page:37 +#: C/documents-view.page:38 msgid "" "In order for your <em>Google Docs</em> or <em>SkyDrive</em> documents to " "appear, it is necessary to configure Google or Windows Live, respectively, " @@ -6345,19 +6338,19 @@ msgstr "" #. (itstool) path: page/p -#: C/documents-view.page:42 +#: C/documents-view.page:43 msgid "To view the contents of a document:" msgstr "" #. (itstool) path: item/p -#: C/documents-view.page:45 +#: C/documents-view.page:46 msgid "" "Click the thumbnail. The document is displayed full-width in the " "<app>Documents</app> window (or full-screen if maximized)." msgstr "" #. (itstool) path: page/p -#: C/documents-view.page:49 +#: C/documents-view.page:50 msgid "To exit the document, click the back arrow button." msgstr "" @@ -8778,17 +8771,17 @@ msgstr "" #. (itstool) path: info/desc -#: C/keyboard-nav.page:19 +#: C/keyboard-nav.page:21 msgid "Use applications and the desktop without a mouse." msgstr "" #. (itstool) path: page/title -#: C/keyboard-nav.page:22 +#: C/keyboard-nav.page:24 msgid "Keyboard navigation" msgstr "" #. (itstool) path: page/p -#: C/keyboard-nav.page:32 +#: C/keyboard-nav.page:34 msgid "" "This page details keyboard navigation for people who cannot use a mouse or " "other pointing device, or who want to use a keyboard as much as possible. " @@ -8797,7 +8790,7 @@ msgstr "" #. (itstool) path: note/p -#: C/keyboard-nav.page:38 +#: C/keyboard-nav.page:40 msgid "" "If you cannot use a pointing device like a mouse, you can control the mouse " "pointer using the numeric keypad on your keyboard. See <link xref=\"mouse-" @@ -8805,17 +8798,17 @@ msgstr "" #. (itstool) path: table/title -#: C/keyboard-nav.page:44 +#: C/keyboard-nav.page:46 msgid "Navigate user interfaces" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:46 +#: C/keyboard-nav.page:48 msgid "<key>Tab</key> and <keyseq><key>Ctrl</key><key>Tab</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:48 +#: C/keyboard-nav.page:50 msgid "" "Move keyboard focus between different controls. <keyseq><key>Ctrl</key> " "<key>Tab</key></keyseq> moves between groups of controls, such as from a " @@ -8825,17 +8818,17 @@ msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:52 +#: C/keyboard-nav.page:54 msgid "Hold down <key>Shift</key> to move focus in reverse order." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:56 +#: C/keyboard-nav.page:58 msgid "Arrow keys" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:58 +#: C/keyboard-nav.page:60 msgid "" "Move selection between items in a single control, or among a set of related " "controls. Use the arrow keys to focus buttons in a toolbar, select items in " @@ -8843,65 +8836,65 @@ msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:61 +#: C/keyboard-nav.page:63 msgid "" "In a tree view, use the left and right arrow keys to collapse and expand " "items with children." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:66 +#: C/keyboard-nav.page:68 msgid "<keyseq><key>Ctrl</key>Arrow keys</keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:67 +#: C/keyboard-nav.page:69 msgid "" "In a list or icon view, move the keyboard focus to another item without " "changing which item is selected." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:71 +#: C/keyboard-nav.page:73 msgid "<keyseq><key>Shift</key>Arrow keys</keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:72 +#: C/keyboard-nav.page:74 msgid "" "In a list or icon view, select all items from the currently selected item to " "the newly focused item." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:76 +#: C/keyboard-nav.page:78 msgid "<key>Space</key>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:77 +#: C/keyboard-nav.page:79 msgid "Activate a focused item such as a button, check box, or list item." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:80 +#: C/keyboard-nav.page:82 msgid "<keyseq><key>Ctrl</key><key>Space</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:81 +#: C/keyboard-nav.page:83 msgid "" "In a list or icon view, select or deselect the focused item without " "deselecting other items." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:85 +#: C/keyboard-nav.page:87 msgid "<key>Alt</key>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:86 +#: C/keyboard-nav.page:88 msgid "" "Hold down the <key>Alt</key> key to reveal <em>accelerators</em>: underlined " "letters on menu items, buttons, and other controls. Press <key>Alt</key> " @@ -8910,104 +8903,104 @@ msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:92 +#: C/keyboard-nav.page:94 msgid "<key>Esc</key>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:93 +#: C/keyboard-nav.page:95 msgid "Exit a menu, popup, switcher, or dialog window." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:96 +#: C/keyboard-nav.page:98 msgid "<key>F10</key>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:97 +#: C/keyboard-nav.page:99 msgid "" "Open the first menu on the menu bar of a window. Use the arrow keys to " "navigate the menus." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:101 +#: C/keyboard-nav.page:103 msgid "<keyseq><key>Shift</key><key>F10</key></keyseq> or the Menu key" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:103 +#: C/keyboard-nav.page:105 msgid "" "Pop up the context menu for the current selection, as if you had right-" "clicked." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:108 +#: C/keyboard-nav.page:110 msgid "<keyseq><key>Ctrl</key><key>F10</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:109 +#: C/keyboard-nav.page:111 msgid "" "In the file manager, pop up the context menu for the current folder, as if " "you had right-clicked on the background and not on any item." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:113 +#: C/keyboard-nav.page:115 msgid "" "<keyseq><key>Ctrl</key><key>PageUp</key></keyseq> and " "<keyseq><key>Ctrl</key><key>PageDown</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:115 +#: C/keyboard-nav.page:117 msgid "In a tabbed interface, switch to the tab to the left or right." msgstr "" #. (itstool) path: table/title -#: C/keyboard-nav.page:120 +#: C/keyboard-nav.page:122 msgid "Navigate the desktop" msgstr "" #. (itstool) path: table/title -#: C/keyboard-nav.page:133 +#: C/keyboard-nav.page:135 msgid "Navigate windows" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:135 +#: C/keyboard-nav.page:137 #: C/shell-keyboard-shortcuts.page:32 msgid "<keyseq><key>Alt</key><key>F4</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:136 +#: C/keyboard-nav.page:138 #: C/shell-keyboard-shortcuts.page:33 msgid "Close the current window." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:139 +#: C/keyboard-nav.page:141 msgid "" "<keyseq><key>Ctrl</key><key xref=\"windows-" "key\">Super</key><key>↓</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:140 +#: C/keyboard-nav.page:142 msgid "Restore a maximized window to its original size." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:143 +#: C/keyboard-nav.page:145 msgid "<keyseq><key>Alt</key><key>F7</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:144 +#: C/keyboard-nav.page:146 msgid "" "Move the current window. Press <keyseq><key>Alt</key><key>F7</key></keyseq>, " "then use the arrow keys to move the window. Press <key>Enter</key> to finish " @@ -9015,12 +9008,12 @@ msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:149 +#: C/keyboard-nav.page:151 msgid "<keyseq><key>Alt</key><key>F8</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:150 +#: C/keyboard-nav.page:152 msgid "" "Resize the current window. Press " "<keyseq><key>Alt</key><key>F8</key></keyseq>, then use the arrow keys to " @@ -9029,48 +9022,48 @@ msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:158 +#: C/keyboard-nav.page:160 msgid "" "<keyseq><key>Ctrl</key><key xref=\"windows-" "key\">Super</key><key>↑</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:159 +#: C/keyboard-nav.page:161 msgid "<link xref=\"shell-windows-maximize\">Maximize</link> a window." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:162 +#: C/keyboard-nav.page:164 msgid "" "<keyseq><key>Ctrl</key><key xref=\"windows-" "key\">Super</key><key>←</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:163 +#: C/keyboard-nav.page:165 msgid "Maximize a window vertically along the left side of the screen." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:167 +#: C/keyboard-nav.page:169 msgid "" "<keyseq><key>Ctrl</key><key xref=\"windows-" "key\">Super</key><key>→</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:168 +#: C/keyboard-nav.page:170 msgid "Maximize a window vertically along the right side of the screen." msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:172 +#: C/keyboard-nav.page:174 msgid "<keyseq><key>Alt</key><key>Space</key></keyseq>" msgstr "" #. (itstool) path: td/p -#: C/keyboard-nav.page:173 +#: C/keyboard-nav.page:175 msgid "Pop up the window menu, as if you had right-clicked on the titlebar." msgstr "" @@ -9153,27 +9146,27 @@ msgstr "" #. (itstool) path: info/desc -#: C/keyboard-shortcuts-set.page:19 +#: C/keyboard-shortcuts-set.page:22 msgid "Define or change keyboard shortcuts in <gui>Keyboard</gui> settings." msgstr "" #. (itstool) path: page/title -#: C/keyboard-shortcuts-set.page:22 +#: C/keyboard-shortcuts-set.page:25 msgid "Set keyboard shortcuts" msgstr "" #. (itstool) path: page/p -#: C/keyboard-shortcuts-set.page:37 +#: C/keyboard-shortcuts-set.page:40 msgid "To change the key or keys to be pressed for a keyboard shortcut:" msgstr "" #. (itstool) path: item/p -#: C/keyboard-shortcuts-set.page:42 +#: C/keyboard-shortcuts-set.page:45 msgid "Open <gui>Keyboard</gui> and select the <gui>Shortcuts</gui> tab." msgstr "" #. (itstool) path: item/p -#: C/keyboard-shortcuts-set.page:45 +#: C/keyboard-shortcuts-set.page:48 msgid "" "Select a category in the left pane, and the row for the desired action on " "the right. The current shortcut definition will change to <gui>New " @@ -9181,24 +9174,24 @@ msgstr "" #. (itstool) path: item/p -#: C/keyboard-shortcuts-set.page:50 +#: C/keyboard-shortcuts-set.page:53 msgid "" "Hold down the desired key combination, or press <key>Backspace</key> to " "clear." msgstr "" #. (itstool) path: section/title -#: C/keyboard-shortcuts-set.page:56 +#: C/keyboard-shortcuts-set.page:59 msgid "Custom shortcuts" msgstr "" #. (itstool) path: section/p -#: C/keyboard-shortcuts-set.page:58 +#: C/keyboard-shortcuts-set.page:61 msgid "To create your own keyboard shortcut:" msgstr "" #. (itstool) path: item/p -#: C/keyboard-shortcuts-set.page:62 +#: C/keyboard-shortcuts-set.page:65 msgid "" "Select <gui>Custom Shortcuts</gui> in the left pane, and click the " "<key>+</key> button (or click the <key>+</key> button in any category). The " @@ -9206,7 +9199,7 @@ msgstr "" #. (itstool) path: item/p -#: C/keyboard-shortcuts-set.page:67 +#: C/keyboard-shortcuts-set.page:70 msgid "" "Type a <gui>Name</gui> to identify the shortcut, and a <gui>Command</gui> to " "run an application, then click <gui>Apply</gui>. For example, if you wanted " @@ -9215,14 +9208,14 @@ msgstr "" #. (itstool) path: item/p -#: C/keyboard-shortcuts-set.page:73 +#: C/keyboard-shortcuts-set.page:76 msgid "" "Click <gui>Disabled</gui> in the row that was just added. When it changes to " "<gui>New accelerator…</gui>, hold down the desired shortcut key combination." msgstr "" #. (itstool) path: section/p -#: C/keyboard-shortcuts-set.page:78 +#: C/keyboard-shortcuts-set.page:81 msgid "" "The command name that you type should be a valid system command. You can " "check that the command works by opening a Terminal and typing it in there. " @@ -9231,7 +9224,7 @@ msgstr "" #. (itstool) path: section/p -#: C/keyboard-shortcuts-set.page:83 +#: C/keyboard-shortcuts-set.page:86 msgid "" "If you want to change the command that is associated with a custom keyboard " "shortcut, double-click the <em>name</em> of the shortcut. The <gui>Custom " @@ -11863,7 +11856,7 @@ #. (itstool) path: credit/name #: C/net-browser.page:19 #: C/net-chat.page:19 -#: C/net-email.page:16 +#: C/net-email.page:17 #: C/net-general.page:19 #: C/net-problem.page:17 #: C/net-security.page:17 @@ -12182,18 +12175,18 @@ msgstr "" #. (itstool) path: info/desc -#: C/net-email.page:11 +#: C/net-email.page:12 msgid "<link xref=\"net-default-email\">Default email apps</link>" msgstr "" #. (itstool) path: credit/name -#: C/net-email.page:20 +#: C/net-email.page:21 #: C/net-general.page:23 msgid "The GNOME Documentation Project" msgstr "" #. (itstool) path: page/title -#: C/net-email.page:24 +#: C/net-email.page:25 msgid "Email & email software" msgstr "" @@ -16625,7 +16618,7 @@ #: C/user-changepassword.page:52 #: C/user-changepicture.page:30 #: C/user-delete.page:32 -#: C/wacom-left-handed.page:27 +#: C/wacom-left-handed.page:28 #: C/wacom-mode.page:24 #: C/wacom-multi-monitor.page:29 #: C/wacom-stylus.page:32 @@ -18918,7 +18911,7 @@ msgctxt "_" msgid "" "external ref='figures/unity-windows.png' " -"md5='a29e8180454ef7c9d06bf4a7f8bf238d'" +"md5='398af87a60d225b450d3179c8248cddf'" msgstr "" #. (itstool) path: info/desc @@ -20136,7 +20129,7 @@ msgctxt "_" msgid "" "external ref='figures/unity-overview.png' " -"md5='e6639b68b89c315005e0fc6099f56ace'" +"md5='676ebde85faf496efc62aa874be15f0c'" msgstr "" #. (itstool) path: media/p @@ -22084,12 +22077,12 @@ msgstr "" #. (itstool) path: page/title -#: C/wacom-left-handed.page:20 +#: C/wacom-left-handed.page:21 msgid "Use the tablet left-handed" msgstr "" #. (itstool) path: page/p -#: C/wacom-left-handed.page:22 +#: C/wacom-left-handed.page:23 msgid "" "Some tablets have hardware buttons on one side. The tablet can be rotated " "180 degrees to position these buttons for left-handed people. To switch the " @@ -22097,7 +22090,7 @@ msgstr "" #. (itstool) path: item/p -#: C/wacom-left-handed.page:29 +#: C/wacom-left-handed.page:30 #: C/wacom-mode.page:26 #: C/wacom-multi-monitor.page:31 #: C/wacom-stylus.page:34 @@ -22105,7 +22098,7 @@ msgstr "" #. (itstool) path: note/p -#: C/wacom-left-handed.page:30 +#: C/wacom-left-handed.page:31 #: C/wacom-mode.page:27 #: C/wacom-multi-monitor.page:32 #: C/wacom-stylus.page:35 @@ -22115,7 +22108,7 @@ msgstr "" #. (itstool) path: item/p -#: C/wacom-left-handed.page:33 +#: C/wacom-left-handed.page:34 msgid "Switch <gui>Left-Handed Orientation</gui> to <gui>ON</gui>." msgstr "" @@ -22202,7 +22195,7 @@ msgstr "" #. (itstool) path: page/title -#: C/wacom.page:18 +#: C/wacom.page:20 msgid "Wacom Graphics Tablet" msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-sso-client.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-sso-client.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-sso-client.po 2016-03-22 15:09:34.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-sso-client.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,503 +0,0 @@ -# Burmese translation for ubuntu-sso-client -# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the ubuntu-sso-client package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: ubuntu-sso-client\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-01-22 12:18+0000\n" -"PO-Revision-Date: 2015-05-09 17:52+0000\n" -"Last-Translator: Rockworld <sumoisrock@gmail.com>\n" -"Language-Team: Burmese <my@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:13+0000\n" -"X-Generator: Launchpad (build 17958)\n" - -#. Undefined variable '_', pylint: disable=E0602 -#. all the text that is used in the gui -#: ../ubuntu_sso/utils/ui.py:51 -#, python-brace-format -msgid "By signing up to {app_name} you agree to our {privacy_policy}" -msgstr "" -"{app_name} တက်လက်မှတ်ထိုးခြင်းအားဖြင့်သင်သည်ကျွန်ုပ်တို့၏ {privacy_policy} " -"ရန်သဘောတူ" - -#: ../ubuntu_sso/utils/ui.py:53 -#, python-brace-format -msgid "By signing up to {app_name} you agree to our {terms_and_conditions}" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:55 -#, python-brace-format -msgid " and {privacy_policy}" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:56 -msgid "Cancel" -msgstr "ပယ်ဖျက်မည်" - -#: ../ubuntu_sso/utils/ui.py:57 -msgid "Type the characters above" -msgstr "အထက်မှ စာလုံးများကို ရိုက်ထည့်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:58 -msgid "There was a problem getting the captcha, reloading..." -msgstr "Captcha စာလုံးများ ရယူရာတွင် ပြဿနာရှိနေပါသည်။ ပြည်လည်ရယူနေပါသည်။" - -#: ../ubuntu_sso/utils/ui.py:60 -#, python-format -msgid "If you can't read this then %(reload_link)s this page" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:62 -msgid "refresh" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:63 -msgid "Reload" -msgstr "ပြန်ဖွင့်မည်" - -#: ../ubuntu_sso/utils/ui.py:64 -msgid "The captcha is a required field" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:65 -msgid "Close window and set up later" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:66 -#, python-brace-format -msgid "Congratulations, {app_name} is installed!" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:67 -#, python-format -msgid "To connect this computer to %(app_name)s enter your details below." -msgstr "" -"ဤကွန်ပျူတာကို %(app_name)s နှင့်ချိတ်ဆက်ရန် လိုအပ်သော အချက်အလက်များကို " -"အောက်တွင်ဖြည့်စွက်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:69 -#, python-brace-format -msgid "Register with {app_name}." -msgstr "{app_name} နှင့်အတူ Register ။" - -#: ../ubuntu_sso/utils/ui.py:70 ../ubuntu_sso/utils/ui.py:95 -#: ../ubuntu_sso/utils/ui.py:145 -msgid "Email address" -msgstr "အီးမေးလိပ်စာ" - -#: ../ubuntu_sso/utils/ui.py:71 -msgid "Re-type Email address" -msgstr "အီးမေးလိပ်စာကို ပြန်ရိုက်ပါ" - -#: ../ubuntu_sso/utils/ui.py:72 -msgid "The email must be a valid email address." -msgstr "အီးမေးလိပ်စာသည် လက်ရှိအသုံးပြုနေသော အီးမေးဖြစ်ရပါမည်။" - -#: ../ubuntu_sso/utils/ui.py:73 -msgid "" -"The email addresses don't match, please double check and try entering them " -"again." -msgstr "အီးမေးလိပ်စာ နှစ်ခု မတူညီပါ။ ပြန်လည်စစ်ဆေးပြီး တူအောင်ပြန်ရိုက်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:75 -msgid "Email" -msgstr "အီးမေးလ်" - -#: ../ubuntu_sso/utils/ui.py:76 -msgid "The email addresses do not match" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:77 -msgid "Enter code verification here" -msgstr "Verification ကုဒ်ကို ဤနေရာတွင်ရိုက်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:78 -msgid "Please enter your name" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:79 -msgid "The process did not finish successfully." -msgstr "ဤလုပ်ငန်းစဉ် မအောင်မြင်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:81 -msgid "Sign me in with my existing account" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:82 -msgid "This field is required." -msgstr "ဤနေရာတွင် ဖြည့်စွက်ရန် လိုအပ်ပါသည်။" - -#: ../ubuntu_sso/utils/ui.py:83 -msgid "I've forgotten my password" -msgstr "စကားဝှက်မေ့နေရင်" - -#: ../ubuntu_sso/utils/ui.py:84 ../ubuntu_sso/utils/ui.py:132 -msgid "Reset password" -msgstr "စကားဝှက်ကို ပြန်ပြင်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:85 -#, python-brace-format -msgid "" -"To reset your {app_name} password, enter your registered email address " -"below. We will send instructions to reset your password." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:88 -msgid "Please enter a valid email address" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:89 -msgid "There was a problem accessing the Ubuntu One backend." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:91 -#, python-format -msgid "Create %(app_name)s account" -msgstr "%(app_name)s အကောင့် ပြုလုပ်ပါ" - -#: ../ubuntu_sso/utils/ui.py:92 -msgid "Loading..." -msgstr "ခေတ္တစောင့်ပါ..." - -#: ../ubuntu_sso/utils/ui.py:93 -msgid "Getting information, please wait..." -msgstr "အချက်အလက ရယူနေပါသည်။ ကျေးဇူးပြု၍ စောင့်ဆိုင်းပေးပါ...." - -#: ../ubuntu_sso/utils/ui.py:94 -msgid "Already have an account? Click here to sign in" -msgstr "အကောင့်ရှိပြီးသားဆိုပါက ဤနေရာကို နှိပ်ပြီးဝင်ပါ" - -#: ../ubuntu_sso/utils/ui.py:96 -#, python-format -msgid "Connect to %(app_name)s" -msgstr "%(app_name)s နှင့်ဆက်သွယ်နေပါသည်" - -#: ../ubuntu_sso/utils/ui.py:97 ../ubuntu_sso/utils/ui.py:111 -msgid "Password" -msgstr "စကားဝှက်" - -#: ../ubuntu_sso/utils/ui.py:99 -#, python-brace-format -msgid "Sign In to {app_name}" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:101 -msgid "Name" -msgstr "အမည်" - -#: ../ubuntu_sso/utils/ui.py:102 -msgid "The name must not be empty." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:103 -msgid "Next" -msgstr "ရှေ့သို့" - -#: ../ubuntu_sso/utils/ui.py:104 -msgid "Network detection" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:105 -#, python-format -msgid "" -"Are you online? We can't detect an internet connection - you will need to be " -"connected to set up %(app_name)s" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:107 -msgid "One moment please..." -msgstr "ခေတ္တစောင့်ပါ..." - -#: ../ubuntu_sso/utils/ui.py:108 -msgid "Create a password" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:109 -msgid "Your password was successfully changed." -msgstr "သင့်စကားဝှက်ကို ပြောင်းလိုက်ပါပြီ။" - -#: ../ubuntu_sso/utils/ui.py:110 -msgid "At least one number" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:112 -msgid "Re-type Password" -msgstr "စကားဝှက်ကို ပြန်ရိုက်ပါ" - -#: ../ubuntu_sso/utils/ui.py:113 -msgid "" -"The password must have a minimum of 8 characters and include one uppercase " -"character and one number." -msgstr "" -"စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအကြီး တစ်လုံး၊ နံပါတ် တစ်ခု ပါရမည်ဖြစ်ပြီး၊ " -"အနည်းဆုံး စာလုံးရေ ၈ လုံး ရှိရပါမည်။" - -#: ../ubuntu_sso/utils/ui.py:115 -msgid "At least 8 characters" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:116 -msgid "Passwords don't match" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:117 -msgid "" -"The passwords don't match, please double check and try entering them again." -msgstr "စကားဝှက် မမှန်ပါ။ ပြန်လည်စစ်ဆေးပြီး စကားဝှက်ကို ပြန်ရိုက်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:119 -msgid "Your password must contain" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:120 -msgid "The password is too weak." -msgstr "ဤစကားဝှက်သည် လုံခြုံရေးအားနည်းသည့်အတွက် မသုံးသင့်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:121 -msgid "At least one uppercase letter" -msgstr "အနည်းဆုံးတယောက် uppercase စာတစ်စောင်" - -#: ../ubuntu_sso/utils/ui.py:122 -msgid "Privacy Policy" -msgstr "ကိုယ်ရေးလုံခြုံမှု မူဝါဒ" - -#: ../ubuntu_sso/utils/ui.py:123 -msgid "Connecting to:" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:124 -msgid "Proxy Settings" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:125 -msgid "Incorrect login details. Please try again." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:126 -msgid "Please provide login details." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:127 -msgid "You are connecting through a proxy." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:128 -msgid "Get Help With Proxies" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:129 -msgid "Proxy password:" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:130 -msgid "Save and Connect" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:131 -msgid "Proxy username:" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:133 -msgid "" -"A password reset code has been sent to your e-mail. Please enter the code " -"below along with your new password." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:135 -msgid "Retype email" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:136 -msgid "Retype password" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:137 -#, python-format -msgid "To reset your %(app_name)s password, enter your email address below:" -msgstr "" -"%(app_name)s စကားဝှက်ကို ပြန်ပြင်ရန် အောက်တွင် အီးမေးလိပ်စာ ရိုက်ထည့်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:139 -msgid "" -"We are very Sorry! The service that signs you on is not responding right " -"now\n" -"Please try again or come back in a few minutes." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:142 -msgid "Sorry we did not recognize the email address." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:144 -msgid "Reset code" -msgstr "စကားဝှက်ပြောင်းရန်ကုဒ်" - -#: ../ubuntu_sso/utils/ui.py:147 -#, python-format -msgid "" -"A password reset code has been sent to %(email)s.\n" -"Please enter the code below along with your new password." -msgstr "" -"စကားဝှက်ပြောင်းရန်ကုဒ်ကို %(email)s သို့ ပို့လိုက်ပါသည်။\n" -"စကားဝှက်အသစ်နှင့် ထိုကုဒ်ကို အောက်တွင် ရိုက်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:149 -msgid "Set Up Account" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:150 -msgid "I don't have an account yet - sign me up" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:151 -msgid "Sign In" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:152 -msgid "Log-in with my existing account." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:153 -msgid "the appname whose ssl error we are going to show." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:154 -msgid "Certificate details" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:155 -msgid "Connect" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:156 -msgid "the details ssl certificate we are going to show." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:163 -msgid "Open the SSL certificate UI." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:164 -msgid "SSL Certificate Not Valid" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:165 -msgid "the domain whose ssl certificate we are going to show." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:166 -#, python-format -msgid "" -"You are trying to connect to a proxy server on %(domain)s. This server uses " -"a secure connection, and the SSL certificate is not valid because:" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:169 -msgid "The certificate has not been verified" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:170 -msgid "Do you want to connect to this server?" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:171 -msgid "Get Help With SSL" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:172 -#, python-format -msgid "" -"If you are not sure about this server, do not use it to connect to " -"%(app_name)s." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:174 -msgid "Remember my settings for this certificate." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:175 -msgid "" -"The name on the certificate isn't valid or doesn't match the name of the site" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:177 -msgid "The certificate has expired" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:178 -#, python-format -msgid "You are now logged into %(app_name)s." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:179 -msgid "Surname" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:180 -msgid "Terms of Service" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:181 -#, python-brace-format -msgid "Sign Up to {app_name}" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:182 -msgid "Show Terms & Conditions" -msgstr "လိုင်စင်သတ်မှတ်ချက်များ ပြပါ။" - -#: ../ubuntu_sso/utils/ui.py:183 -#, python-format -msgid "" -"Agreeing to the %(app_name)s Terms & Conditions is required to subscribe." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:185 -#, python-format -msgid "You can also find these terms at <a href='%(url)s'>%(url)s</a>" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:186 -msgid "Try again" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:187 -msgid "" -"There was an error when trying to complete the process. Please check the " -"information and try again." -msgstr "" -"လုပ်ငန်းစဉ်တွင် ပြဿနာရှိပါသည်။ အချက်အလက်များကို ပြန်လည်စစ်ဆေးပြီး " -"ထပ်မံလုပ်ဆောင်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:189 -msgid "Verification code" -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:190 -#, python-format -msgid "" -"Check %(email)s for an email from Ubuntu One. This message contains a " -"verification code. Enter the code in the field below and click OK to " -"complete creating your %(app_name)s account." -msgstr "" - -#: ../ubuntu_sso/utils/ui.py:194 -msgid "Enter verification code" -msgstr "Verification code ကို ရိုက်ထည့်ပါ။" - -#: ../ubuntu_sso/utils/ui.py:197 -#, python-format -msgid "I agree with the %(app_name)s terms and conditions" -msgstr "%(app_name)s ၏ လိုင်စင်သတ်မှတ်ချက်များကို သဘောတူပါသည်။" - -#: ../ubuntu_sso/utils/ui.py:198 -#, python-format -msgid "Yes! Email me %(app_name)s tips and updates." -msgstr "" -"%(app_name)s အသုံးပြုပုံ၊ နောက်ဆုံးသတင်းများကို အီးမေးဖြင့် ပို့ပေးပါ။" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-ui-toolkit.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-ui-toolkit.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-ui-toolkit.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-ui-toolkit.po 2016-04-15 08:51:12.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 14:41+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 08:18+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: Ubuntu/Components/1.2/TextInputPopover.qml:29 #: Ubuntu/Components/1.3/TextInputPopover.qml:29 diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-wallpapers.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-wallpapers.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/ubuntu-wallpapers.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/ubuntu-wallpapers.po 2016-04-15 08:51:15.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-wallpapers\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-08 15:15+0000\n" +"POT-Creation-Date: 2016-04-07 16:55+0000\n" "PO-Revision-Date: 2012-09-17 05:27+0000\n" "Last-Translator: Pyae Sone <Unknown>\n" "Language-Team: Burmese <my@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:42+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:19+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../ubuntu-wallpapers.xml.in.h:1 msgid "Ubuntu" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/update-manager.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/update-manager.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/update-manager.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/update-manager.po 2016-04-15 08:51:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2015-10-09 05:07+0000\n" +"POT-Creation-Date: 2016-04-12 03:58+0000\n" "PO-Revision-Date: 2016-02-26 14:06+0000\n" "Last-Translator: ANyarThar <phoehtt@gmail.com>\n" "Language-Team: Burmese <my@li.org>\n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:28+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:08+0000\n" +"X-Generator: Launchpad (build 17995)\n" "Language: my\n" #: ../UpdateManager/backend/InstallBackendAptdaemon.py:67 @@ -179,90 +179,90 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:251 +#: ../UpdateManager/UpdatesAvailable.py:250 msgid "Install Now" msgstr "ယခုထည့်သွင်းပါ" -#: ../UpdateManager/UpdatesAvailable.py:284 +#: ../UpdateManager/UpdatesAvailable.py:283 #: ../UpdateManagerText/UpdateManagerText.py:36 msgid "Install" msgstr "စက်ထဲသို့ထည့်သွင်းမည်" -#: ../UpdateManager/UpdatesAvailable.py:318 +#: ../UpdateManager/UpdatesAvailable.py:317 msgid "Download" msgstr "အင်တာနက် ပေါ်မှ ယူထားသောဖိုင်" -#: ../UpdateManager/UpdatesAvailable.py:377 +#: ../UpdateManager/UpdatesAvailable.py:376 msgid "_Remind Me Later" msgstr "_R နောက်မှ သတိပေးပါ။" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdatesAvailable.py:514 +#: ../UpdateManager/UpdatesAvailable.py:513 #, python-format msgid "Version %s: \n" msgstr "ဗားရှင်း %s- \n" -#: ../UpdateManager/UpdatesAvailable.py:577 +#: ../UpdateManager/UpdatesAvailable.py:576 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "နတ်ဝေါ့ချိတ်ဆက်မှု့မသိရှိပါ။ ပြောင်းလဲခြင်းမှတ်တမ်းကိုဒေါင်းလုတ်မချနိုင်ပါ။" -#: ../UpdateManager/UpdatesAvailable.py:587 +#: ../UpdateManager/UpdatesAvailable.py:586 msgid "Downloading list of changes..." msgstr "ပြောင်းလဲမှု့စာရင်းကိုဒေါင်းလုတ်ချနေပါသည်။" -#: ../UpdateManager/UpdatesAvailable.py:631 +#: ../UpdateManager/UpdatesAvailable.py:630 msgid "_Deselect All" msgstr "_D Select အားလုံးဖြုတ်မည်။" -#: ../UpdateManager/UpdatesAvailable.py:637 +#: ../UpdateManager/UpdatesAvailable.py:636 msgid "Select _All" msgstr "အားလုံးကို ရွေးပါ" -#: ../UpdateManager/UpdatesAvailable.py:732 +#: ../UpdateManager/UpdatesAvailable.py:731 #, python-format msgid "%s will be downloaded." msgstr "%s ကိုဒေါင်းလုတ်ဆွဲပါလိမ့်မည်။" -#: ../UpdateManager/UpdatesAvailable.py:746 +#: ../UpdateManager/UpdatesAvailable.py:745 msgid "The update has already been downloaded." msgid_plural "The updates have already been downloaded." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdatesAvailable.py:752 +#: ../UpdateManager/UpdatesAvailable.py:751 msgid "There are no updates to install." msgstr "အသစ်သွင်းရန်မရှိပါ။" -#: ../UpdateManager/UpdatesAvailable.py:761 +#: ../UpdateManager/UpdatesAvailable.py:760 msgid "Unknown download size." msgstr "မသိရှိသောဒေါင်းလုတ်အရွယ်အစား" -#: ../UpdateManager/UpdatesAvailable.py:788 +#: ../UpdateManager/UpdatesAvailable.py:787 #, python-format msgid "" "Updated software has been issued since %s %s was released. Do you want to " "install it now?" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:793 +#: ../UpdateManager/UpdatesAvailable.py:792 msgid "" "Updated software is available for this computer. Do you want to install it " "now?" msgstr "Updated software ကိုဒီကွန်ပြူတာအတွက်ရရှိနိုင်ပါပြီ။ သွင်းချင်ပါသလား။" -#: ../UpdateManager/UpdatesAvailable.py:796 +#: ../UpdateManager/UpdatesAvailable.py:795 msgid "" "The computer also needs to restart to finish installing previous updates." msgstr "" #. print("on_button_install_clicked") -#: ../UpdateManager/UpdatesAvailable.py:826 +#: ../UpdateManager/UpdatesAvailable.py:825 msgid "Not enough free disk space" msgstr "နေရာလွတ်မလောက်ပါ။" -#: ../UpdateManager/UpdatesAvailable.py:827 +#: ../UpdateManager/UpdatesAvailable.py:826 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -273,19 +273,19 @@ "လောက်နေရာလွတ်အောင်ရှင်းပေးပါ။. အမှိုက်ပုံးကိုရှင်းပါ။ ယခင်သွင်းထားသော ခေတ္တ " "Package များကို'sudo apt-get clean' ရိုက်၍ဖြုတ်ပါ။ a" -#: ../UpdateManager/UpdatesAvailable.py:853 +#: ../UpdateManager/UpdatesAvailable.py:852 msgid "Connecting..." msgstr "ချိတ်ဆက်နေပါသည်" -#: ../UpdateManager/UpdatesAvailable.py:869 +#: ../UpdateManager/UpdatesAvailable.py:868 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:1018 +#: ../UpdateManager/UpdatesAvailable.py:1017 msgid "Security updates" msgstr "လုံခြုံရေးအသစ်ထွက်ရှိမှု့များ" -#: ../UpdateManager/UpdatesAvailable.py:1021 +#: ../UpdateManager/UpdatesAvailable.py:1020 msgid "Other updates" msgstr "တခြားအသစ်များ" @@ -374,14 +374,14 @@ msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../UpdateManager/Core/utils.py:485 +#: ../UpdateManager/Core/utils.py:484 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/Core/utils.py:489 +#: ../UpdateManager/Core/utils.py:488 #, python-format msgid "%.1f MB" msgstr "%.1f MB" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/usbcreator.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/usbcreator.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/usbcreator.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/usbcreator.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 13:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:29+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: .././gui/usbcreator-gtk.ui.h:1 msgid "Installation Failed" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/wdiff-gnulib.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/wdiff-gnulib.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/wdiff-gnulib.po 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/wdiff-gnulib.po 2016-04-15 08:51:12.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:31+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: lib/error.c:188 msgid "Unknown system error" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/wdiff.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/wdiff.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/wdiff.po 2016-03-22 15:09:33.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/wdiff.po 2016-04-15 08:51:13.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 12:50+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:31+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/mdiff.c:376 #, c-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/webbrowser-app.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/webbrowser-app.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/webbrowser-app.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/webbrowser-app.po 2016-04-15 08:51:14.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 14:41+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 08:18+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,14 +50,14 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 -#: src/app/webbrowser/ContentDownloadDialog.qml:113 +#: src/app/webbrowser/ContentDownloadDialog.qml:114 #: src/app/webbrowser/ContextMenuMobile.qml:139 #: src/app/webbrowser/DownloadDelegate.qml:187 #: src/app/webbrowser/HistoryView.qml:175 -#: src/app/webbrowser/HistoryViewWide.qml:397 +#: src/app/webbrowser/HistoryViewWide.qml:382 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:275 -#: src/app/webbrowser/SettingsPage.qml:329 +#: src/app/webbrowser/SettingsPage.qml:297 +#: src/app/webbrowser/SettingsPage.qml:351 #: src/app/webcontainer/AccountChooserDialog.qml:96 #: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" @@ -348,7 +348,7 @@ msgid "Erase" msgstr "ဖြတ်ထုတ်မည်" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:556 msgid "Find in page" msgstr "စာမျက်နှာတွင်ရှာပါ" @@ -378,7 +378,7 @@ msgid "Address;URL;www" msgstr "လိပ်စာ;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:439 #: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Tab အသစ်" @@ -436,13 +436,13 @@ msgid "Save video" msgstr "ဗီဒီယို သိမ်းမည်" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:86 #: src/app/webbrowser/HistoryView.qml:190 -#: src/app/webbrowser/HistoryViewWide.qml:422 +#: src/app/webbrowser/HistoryViewWide.qml:407 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:536 msgid "Share" msgstr "" @@ -451,16 +451,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:210 +#: src/app/webbrowser/AddressBar.qml:208 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:244 msgid "find in page" msgstr "စာမျက်နှာတွင်ရှာပါ" -#: src/app/webbrowser/AddressBar.qml:247 +#: src/app/webbrowser/AddressBar.qml:245 msgid "search or enter an address" msgstr "ရှာဖွေပါ သို့မဟုတ် လိပ်စာတစ်ခုထည့်ပါ" @@ -494,84 +494,85 @@ msgstr "ဖိုင်တွဲအသစ် ပြုလုပ်ပါ" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:339 +#: src/app/webbrowser/SettingsPage.qml:361 msgid "Save" msgstr "သိမ်းဆည်းမည်" #: src/app/webbrowser/BookmarksFoldersView.qml:191 #: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 -#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:303 +#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/SettingsPage.qml:96 +#: src/app/webbrowser/SettingsPage.qml:325 msgid "Homepage" msgstr "" #: src/app/webbrowser/BookmarksView.qml:81 #: src/app/webbrowser/BookmarksViewWide.qml:80 -#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/Browser.qml:544 src/app/webbrowser/NewTabView.qml:135 #: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "မှတ်သားချက်များ" #: src/app/webbrowser/BookmarksView.qml:113 #: src/app/webbrowser/BookmarksViewWide.qml:112 -#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 -#: src/app/webbrowser/HistoryViewWide.qml:517 +#: src/app/webbrowser/Browser.qml:425 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:501 msgid "Done" msgstr "ပြီးပီ" #: src/app/webbrowser/BookmarksView.qml:127 #: src/app/webbrowser/BookmarksViewWide.qml:126 #: src/app/webbrowser/HistoryView.qml:145 -#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/HistoryViewWide.qml:515 #: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:546 -#: src/app/webbrowser/HistoryViewWide.qml:381 +#: src/app/webbrowser/Browser.qml:550 +#: src/app/webbrowser/HistoryViewWide.qml:366 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 +#: src/app/webbrowser/Browser.qml:563 src/app/webbrowser/DownloadsPage.qml:58 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:566 +#: src/app/webbrowser/Browser.qml:570 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:566 +#: src/app/webbrowser/Browser.qml:570 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:588 src/app/webbrowser/SettingsPage.qml:49 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 +#: src/app/webbrowser/Browser.qml:760 src/app/webbrowser/Browser.qml:798 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1345 +#: src/app/webbrowser/Browser.qml:1379 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1346 +#: src/app/webbrowser/Browser.qml:1380 msgid "Press ESC To Exit Full Screen" msgstr "မျက်နှာပြင်အပြည့်မှထွက်ရန်ESCကိုနှိပ်ပါ" -#: src/app/webbrowser/ContentDownloadDialog.qml:82 +#: src/app/webbrowser/ContentDownloadDialog.qml:83 msgid "" "Choose an application to open this file or add it to the downloads folder." msgstr "" -#: src/app/webbrowser/ContentDownloadDialog.qml:88 +#: src/app/webbrowser/ContentDownloadDialog.qml:89 msgid "Choose an application" msgstr "အသုံးချပရိုဂရမ်တစ်ခုရွေးပါ" -#: src/app/webbrowser/ContentDownloadDialog.qml:101 +#: src/app/webbrowser/ContentDownloadDialog.qml:102 msgid "Download" msgstr "" @@ -583,17 +584,17 @@ msgid "Resume" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:61 +#: src/app/webbrowser/DownloadsPage.qml:62 msgid "Confirm selection" msgstr "ရွေးချယ်မူအတည်ပြုသည်" -#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/DownloadsPage.qml:102 #: src/app/webbrowser/HistoryView.qml:217 -#: src/app/webbrowser/HistoryViewWide.qml:441 +#: src/app/webbrowser/HistoryViewWide.qml:426 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:252 +#: src/app/webbrowser/DownloadsPage.qml:264 msgid "No downloads available" msgstr "" @@ -614,20 +615,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:212 +#: src/app/webbrowser/HistoryViewWide.qml:175 msgid "Yesterday" msgstr "မနေ့က" -#: src/app/webbrowser/HistoryViewWide.qml:196 +#: src/app/webbrowser/HistoryViewWide.qml:159 msgid "All History" msgstr "မှတ်တမ်းများအားလုံး" -#: src/app/webbrowser/HistoryViewWide.qml:210 -#: src/app/webbrowser/HistoryViewWide.qml:295 +#: src/app/webbrowser/HistoryViewWide.qml:173 +#: src/app/webbrowser/HistoryViewWide.qml:282 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:462 +#: src/app/webbrowser/HistoryViewWide.qml:447 msgid "search history" msgstr "မှတ်တမ်း ရှာပါ" @@ -635,29 +636,29 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 +#: src/app/MediaAccessDialog.qml:38 msgid "Allow this domain to access your camera and microphone?" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:29 +#: src/app/MediaAccessDialog.qml:39 msgid "Allow this domain to access your camera?" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:30 +#: src/app/MediaAccessDialog.qml:40 msgid "Allow this domain to access your microphone?" msgstr "" #. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 +#: src/app/MediaAccessDialog.qml:48 #, qt-format msgid "%1 (embedded in %2)" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:48 +#: src/app/MediaAccessDialog.qml:72 msgid "Yes" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:60 +#: src/app/MediaAccessDialog.qml:83 msgid "No" msgstr "" @@ -760,54 +761,54 @@ msgid "Default" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:156 +#: src/app/webbrowser/SettingsPage.qml:82 +#: src/app/webbrowser/SettingsPage.qml:167 msgid "Search engine" msgstr "ရှာဖွေရေး အင်ဂျင်" -#: src/app/webbrowser/SettingsPage.qml:100 +#: src/app/webbrowser/SettingsPage.qml:107 msgid "Restore previous session at startup" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:118 -#: src/app/webbrowser/SettingsPage.qml:208 +#: src/app/webbrowser/SettingsPage.qml:126 +#: src/app/webbrowser/SettingsPage.qml:224 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:126 +#: src/app/webbrowser/SettingsPage.qml:136 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:229 -#: src/app/webbrowser/SettingsPage.qml:367 +#: src/app/webbrowser/SettingsPage.qml:246 +#: src/app/webbrowser/SettingsPage.qml:389 msgid "Camera & microphone" msgstr "ကင်မရာ နှင့် မိုက်ခရိုဖုန်း" -#: src/app/webbrowser/SettingsPage.qml:235 +#: src/app/webbrowser/SettingsPage.qml:254 msgid "Clear Browsing History" msgstr "ကြည့်ရူ့ထားသော မှတ်တမ်းများကို ရှင်းလင်းပါ" -#: src/app/webbrowser/SettingsPage.qml:238 +#: src/app/webbrowser/SettingsPage.qml:258 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:245 +#: src/app/webbrowser/SettingsPage.qml:266 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:247 +#: src/app/webbrowser/SettingsPage.qml:269 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:282 +#: src/app/webbrowser/SettingsPage.qml:304 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:387 +#: src/app/webbrowser/SettingsPage.qml:410 msgid "Microphone" msgstr "မိုက်ခရိုဖုန်း" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:431 msgid "Camera" msgstr "" @@ -825,13 +826,13 @@ #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 -#: src/app/webcontainer/webapp-container.qml:67 +#: src/app/webcontainer/webapp-container.qml:68 #, qt-format msgid "%1 - Ubuntu Web Browser" msgstr "" #: src/app/webbrowser/webbrowser-app.qml:37 -#: src/app/webcontainer/webapp-container.qml:69 +#: src/app/webcontainer/webapp-container.qml:70 msgid "Ubuntu Web Browser" msgstr "" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/whoopsie-preferences.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/whoopsie-preferences.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/whoopsie-preferences.po 2016-03-22 15:09:35.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/whoopsie-preferences.po 2016-04-15 08:51:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 14:45+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 08:22+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../src/com.ubuntu.whoopsiepreferences.policy.in.h:1 msgid "Privacy settings" diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/xen-xm.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/xen-xm.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/xen-xm.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/xen-xm.po 2016-04-15 08:51:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-03-22 12:51+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 06:32+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: xen/xm/XenAPI.py:58 #, python-format diff -Nru language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/xz.po language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/xz.po --- language-pack-my-base-16.04+20160322/data/my/LC_MESSAGES/xz.po 2016-03-22 15:09:36.000000000 +0000 +++ language-pack-my-base-16.04+20160415/data/my/LC_MESSAGES/xz.po 2016-04-15 08:51:15.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2016-03-22 13:56+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Launchpad-Export-Date: 2016-04-15 07:34+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: src/xz/args.c:337 #, c-format diff -Nru language-pack-my-base-16.04+20160322/debian/changelog language-pack-my-base-16.04+20160415/debian/changelog --- language-pack-my-base-16.04+20160322/debian/changelog 2016-03-22 15:09:32.000000000 +0000 +++ language-pack-my-base-16.04+20160415/debian/changelog 2016-04-15 08:51:12.000000000 +0000 @@ -1,6 +1,6 @@ -language-pack-my-base (1:16.04+20160322) xenial; urgency=low +language-pack-my-base (1:16.04+20160415) xenial; urgency=low * Initial Release. - -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com> Tue, 22 Mar 2016 15:09:32 +0000 + -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com> Fri, 15 Apr 2016 08:51:11 +0000