SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
5 years ago · 00661fb2e4
parent 6ab837e8ce
commit 00661fb2e4
22 changed files with 22 additions and 3 deletions
--- a/applets/systemmonitor/memory/metadata.desktop
+++ b/applets/systemmonitor/memory/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Memory Usage
+Name[ast]=Usu de la memoria
 Name[az]=Yaddaş İstifadəsi
 Name[ca]=Ús de memòria
 Name[cs]=Spotřeba paměti
--- a/dataengines/dict/plasma-dataengine-dict.desktop
+++ b/dataengines/dict/plasma-dataengine-dict.desktop
@ -82,7 +82,7 @@ Name[zh_TW]=字典
 Comment=Look up word meanings
 Comment[af]=Slaan woordbetekenisse na
 Comment[ar]=ابحث عن معاني الكلمات
-Comment[ast]=Gueta significaos de pallabres
+Comment[ast]=Busca significaos de pallabres
 Comment[az]=Söz və tərcümələrin mənalarını göstərmək
 Comment[be@latin]=Pošuk značeńniaŭ słovaŭ
 Comment[bg]=Търсене значението на думи
--- a/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop
+++ b/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop
@ -31,6 +31,7 @@ GenericName[vi]=Trình biên tập quy hoạch màu
 GenericName[x-test]=xxColor scheme editorxx
 GenericName[zh_CN]=配色编辑器
 Name=KColorSchemeEditor
+Name[ast]=KColorSchemeEditor
 Name[az]=KColorSchemeEditor
 Name[ca]=KColorSchemeEditor
 Name[cs]=KColorSchemeEditor
--- a/kcms/colors/kcm_colors.desktop
+++ b/kcms/colors/kcm_colors.desktop
@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance
 X-KDE-Weight=40

 Name=Colors
+Name[ast]=Colores
 Name[az]=Rənglər
 Name[ca]=Colors
 Name[cs]=Barvy
--- a/kcms/colors/package/metadata.desktop
+++ b/kcms/colors/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Colors
+Name[ast]=Colores
 Name[az]=Rənglər
 Name[ca]=Colors
 Name[cs]=Barvy
--- a/kcms/cursortheme/kcm_cursortheme.desktop
+++ b/kcms/cursortheme/kcm_cursortheme.desktop
@ -10,6 +10,7 @@ X-DocPath=kcontrol/cursortheme/index.html
 X-KDE-Weight=70

 Name=Cursors
+Name[ast]=Cursores
 Name[az]=Kursorlar
 Name[ca]=Cursors
 Name[cs]=Kurzory
--- a/kcms/cursortheme/package/metadata.desktop
+++ b/kcms/cursortheme/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Cursors
+Name[ast]=Cursores
 Name[az]=Kursorlar
 Name[ca]=Cursors
 Name[cs]=Kurzory
--- a/kcms/cursortheme/xcursor/xcursor.knsrc
+++ b/kcms/cursortheme/xcursor/xcursor.knsrc
@ -1,5 +1,6 @@
 [KNewStuff3]
 Name=Cursors
+Name[ast]=Cursores
 Name[az]=Kursorlar
 Name[ca]=Cursors
 Name[cs]=Kurzory
--- a/kcms/desktoptheme/kcm_desktoptheme.desktop
+++ b/kcms/desktoptheme/kcm_desktoptheme.desktop
@ -10,6 +10,7 @@ X-KDE-Weight=20
 X-DocPath=kcontrol/desktopthemedetails/index.html

 Name=Plasma Style
+Name[ast]=Estilu de Plasma
 Name[az]=Plasma Üslubu
 Name[ca]=Estil del Plasma
 Name[cs]=Styl Plasma
--- a/kcms/desktoptheme/package/metadata.desktop
+++ b/kcms/desktoptheme/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Plasma Style
+Name[ast]=Estilu de Plasma
 Name[az]=Plasma Üslubu
 Name[ca]=Estil del Plasma
 Name[cs]=Styl Plasma
--- a/kcms/desktoptheme/plasma-themes.knsrc
+++ b/kcms/desktoptheme/plasma-themes.knsrc
@ -1,5 +1,6 @@
 [KNewStuff3]
 Name=Plasma Styles
+Name[ast]=Estilos de Plasma
 Name[az]=Plasma Üslubu
 Name[ca]=Estils del Plasma
 Name[cs]=Styly Plasma
--- a/kcms/feedback/kcm_feedback.desktop
+++ b/kcms/feedback/kcm_feedback.desktop
@ -43,7 +43,7 @@ Name[sl]=Uporabnikov odziv
 Name[sv]=Användaråterkoppling
 Name[tg]=Изҳори назари корбар
 Name[uk]=Відгуки користувача
-Name[vi]=Phản hồi của Người dùng
+Name[vi]=Phản hồi của người dùng
 Name[x-test]=xxUser Feedbackxx
 Name[zh_CN]=用户反馈
 Name[zh_TW]=使用者意見回應
--- a/kcms/icons/icons.knsrc
+++ b/kcms/icons/icons.knsrc
@ -1,5 +1,6 @@
 [KNewStuff3]
 Name=Icons
+Name[ast]=Iconos
 Name[az]=Nişanlar
 Name[ca]=Icones
 Name[cs]=Ikony
--- a/kcms/icons/kcm_icons.desktop
+++ b/kcms/icons/kcm_icons.desktop
@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance
 X-KDE-Weight=60

 Name=Icons
+Name[ast]=Iconos
 Name[az]=Nişanlar
 Name[ca]=Icones
 Name[cs]=Ikony
--- a/kcms/icons/package/metadata.desktop
+++ b/kcms/icons/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Icons
+Name[ast]=Iconos
 Name[az]=Nişanlar
 Name[ca]=Icones
 Name[cs]=Ikony
--- a/kcms/kfontinst/apps/org.kde.kfontview.desktop
+++ b/kcms/kfontinst/apps/org.kde.kfontview.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=KFontView
+Name[ast]=KFontView
 Name[az]=KFontView
 Name[ca]=KFontView
 Name[cs]=Prohlížeč písem
--- a/kcms/kfontinst/kcmfontinst/fontinst.desktop
+++ b/kcms/kfontinst/kcmfontinst/fontinst.desktop
@ -11,6 +11,7 @@ Categories=Qt;KDE;X-KDE-settings-system;
 X-KDE-System-Settings-Parent-Category=font

 Name=Font Management
+Name[ast]=Xestión de fontes
 Name[az]=Şrift İdarəeetməsi
 Name[ca]=Gestió dels tipus de lletra
 Name[cs]=Správa písem
--- a/kcms/lookandfeel/kcm_lookandfeel.desktop
+++ b/kcms/lookandfeel/kcm_lookandfeel.desktop
@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance
 X-KDE-Weight=1

 Name=Global Theme
+Name[ast]=Estilu global
 Name[az]=Qlobal Plasma Görünüşü
 Name[ca]=Tema global
 Name[cs]=Celkový motiv
--- a/kcms/lookandfeel/lookandfeel.knsrc
+++ b/kcms/lookandfeel/lookandfeel.knsrc
@ -1,5 +1,6 @@
 [KNewStuff3]
 Name=Global Themes
+Name[ast]=Estilos globales
 Name[az]=Qlobal Plasma Mövzuları
 Name[ca]=Temes globals
 Name[cs]=Celkové motivy
--- a/kcms/lookandfeel/package/metadata.desktop
+++ b/kcms/lookandfeel/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Global Theme
+Name[ast]=Estilu global
 Name[az]=Qlobal Plasma Görünüşü
 Name[ca]=Tema global
 Name[cs]=Celkový motiv
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@ -51,7 +51,7 @@ Name[x-test]=xxDesktop Searchxx
 Name[zh_CN]=桌面搜索
 Name[zh_TW]=桌面搜尋
 Comment=Searches through files, emails and contacts
-Comment[ast]=Gueta pente ficheros, correos y contautos
+Comment[ast]=Busca pente ficheros, correos y contautos
 Comment[az]=Fayllar, e-poçtlar və tərkiblər arası axtarış edir
 Comment[ca]=Cerca pels fitxers, correus electrònics i contactes
 Comment[ca@valencia]=Busca pels fitxers, correus electrònics i contactes
--- a/runners/recentdocuments/plasma-runner-recentdocuments.desktop
+++ b/runners/recentdocuments/plasma-runner-recentdocuments.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Recent Files
+Name[ast]=Ficheros d'apocayá
 Name[az]=Sonuncu fayllar
 Name[ca]=Fitxers recents
 Name[cs]=Nedávné soubory