Merge branch 'master' of github.com:pcbsd/pcbsd

trueos · Nov 28, 2013 · 39f875c · 39f875c
2 parents a628ab0 + ea87ac6
commit 39f875c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 28 deletions.
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uk.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uk.ts
@@ -249,8 +249,7 @@
     </message>
     <message>
         <source>Boot Environment names may only be comprised of letters and numbers</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ім&apos;я оточення завантаження має містити лише букви та цифри</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt4/pc-pkgmanager/i18n/PackageManager_uk.ts b/src-qt4/pc-pkgmanager/i18n/PackageManager_uk.ts
@@ -260,13 +260,11 @@
     </message>
     <message>
         <source>Package Check</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Перевірка пакунків</translation>
     </message>
     <message>
         <source>Unable to check for package updates!</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Неможливо перевірити наявність оновлень!</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt4/xtrafiles/local/share/wallpapers/pcbsd10-default/metadata.desktop b/src-qt4/xtrafiles/local/share/wallpapers/pcbsd10-default/metadata.desktop
@@ -15,3 +15,4 @@ Name[ja]=デフォルト: PC-BSD 10
 Name[lv]=Noklusējums: PC-BSD 10
 Name[nl]=Standaard: PC-BSD 10
 Name[pl]=Domyślnie: PC-BSD 10
+Name[uk]=Default: PC-BSD 10
diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/02Mate.desktop b/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/02Mate.desktop
@@ -152,7 +152,7 @@ Comment[te]=ఈ విభాగము MATEనకు లాగ్ చేస్త
 Comment[th]=วาระนี้จะเข้าสู่ MATE
 Comment[tr]=Bu oturum MATE girişi yapmanızı sağlar
 Comment[ug]=بۇ ئەڭگىمە سىزنى MATE غا ئەكىرىدۇ.
-Comment[uk]=Це - сеанс входу у MATE
+Comment[uk]=В цій сесії ви увійдете до MATE
 Comment[uz@cyrillic]=Ушбу сеанс MATE'га киришингизни таъминлайди
 Comment[uz]=Ushbu seans MATE'ga kirishingizni taʼminlaydi
 Comment[vi]=Phiên chạy này sẽ đăng nhập bạn vào MATE

diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/32Cinnamon.desktop b/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/32Cinnamon.desktop
@@ -11,9 +11,11 @@ Name[fi]=Cinnamon
 Name[ko]=시나몬
 Name[nl]=Cinnamon
 Name[pl]=Cinnamon
+Name[uk]=Cinnamon
 Comment=This session logs you into Cinnamon
 Comment[de]=Diese Sitzung meldet Sie bei Cinnamon an
 Comment[en_GB]=This session logs you into Cinnamon
 Comment[en_ZA]=This session logs you into Cinnamon
 Comment[nl]=Deze sessie meldt u aan in Cinnamon
 Comment[pl]=Ta sesja zaloguje Cię do Cinnamon
+Comment[uk]=В цій сесії ви увійдете до Cinnamon
diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/33Cinnamon2d.desktop b/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/33Cinnamon2d.desktop
diff --git a/src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/pkg-desc b/src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/pkg-desc
@@ -1 +1 @@
-The GNOME2 Desktop
+The Mate Desktop