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"
4 years ago · ddcc2bbe6b
parent d87bdb379a
commit ddcc2bbe6b
16 changed files with 38 additions and 0 deletions
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@ -1,5 +1,6 @@
 [KNewStuff3]
 Name=Latte Indicators
+Name[az]=Latte İndikatorları
 Name[ca]=Indicadors del Latte
 Name[ca@valencia]=Indicadors del Latte
 Name[cs]=Ukazatele Latte
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@ -1,6 +1,7 @@
 [KNewStuff3]
 Name=Latte Layouts
 Name[ar]=مخطّطات لاتيه
+Name[az]=Latte Maketləri
 Name[ca]=Disposicions del Latte
 Name[ca@valencia]=Disposicions del Latte
 Name[cs]=Rozložení Latte
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -1,6 +1,7 @@
 [Global]
 Name=Latte Dock
 Name[ar]=رصيف لاتيه
+Name[az]=Latte Dok Paneli
 Name[ca]=Acoblador Latte
 Name[ca@valencia]=Acoblador Latte
 Name[cs]=Dok Latte
@ -33,6 +34,7 @@ Name[zh_CN]=Latte 停靠栏
 Name[zh_TW]=Latte Dock
 Comment=Latte Dock
 Comment[ar]=رصيف لاتيه
+Comment[az]=Latte Dok Paneli
 Comment[ca]=Acoblador Latte
 Comment[ca@valencia]=Acoblador Latte
 Comment[cs]=Dok Latte
@ -67,6 +69,7 @@ IconName=latte-dock

 [Event/import-done]
 Name=Imported successfully
+Name[az]=Müvəffəqiyyətlə İdxal Olundu
 Name[ca]=S'ha importat amb èxit
 Name[ca@valencia]=S'ha importat amb èxit
 Name[cs]=Importováno úspěšně
@ -100,6 +103,7 @@ Action=Popup

 [Event/import-fail]
 Name=Failed to import
+Name[az]=İdxal baş tutmadı
 Name[ca]=Ha fallat en importar
 Name[ca@valencia]=Ha fallat en importar
 Name[cs]=Nepodařilo se importovat
@ -133,6 +137,7 @@ Action=Popup

 [Event/export-done]
 Name=Exported successfully
+Name[az]=Müvəffəqiyyətlə ixrac olundu
 Name[ca]=S'ha exportat amb èxit
 Name[ca@valencia]=S'ha exportat amb èxit
 Name[cs]=Exportováno úspěšně
@ -166,6 +171,7 @@ Action=Popup

 [Event/export-fail]
 Name=Failed to export
+Name[az]=İxrac baş tutmadı
 Name[ca]=Ha fallat en exportar
 Name[ca@valencia]=Ha fallat en exportar
 Name[cs]=Export selhal
@ -199,6 +205,7 @@ Action=Popup

 [Event/remove-done]
 Name=Removed successfully
+Name[az]=Müvəffəqiyyətlə silindi
 Name[ca]=S'ha eliminat amb èxit
 Name[ca@valencia]=S'ha eliminat amb èxit
 Name[cs]=Úspěšně odstraněno
@ -232,6 +239,7 @@ Action=Popup

 [Event/remove-fail]
 Name=Failed to remove
+Name[az]=Silinmə alınmadı
 Name[ca]=Ha fallat en eliminar
 Name[ca@valencia]=Ha fallat en eliminar
 Name[cs]=Selhalo odstranění 
@ -266,6 +274,7 @@ Action=Popup

 [Event/switch-layout]
 Name=Switch to layout
+Name[az]=Maketi Keçmək
 Name[ca]=Commuta a la disposició
 Name[ca@valencia]=Commuta a la disposició
 Name[cs]=Přepnout na rozložení
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Latte
+Name[az]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
@ -31,6 +32,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Dock for the masses
+Comment[az]=Hər kəs üçün Dok panel
 Comment[ca]=Acoblador per a les masses
 Comment[ca@valencia]=Acoblador per a les masses
 Comment[cs]=Dok pro masy
@ -62,6 +64,7 @@ Comment[x-test]=xxDock for the massesxx
 Comment[zh_CN]=给大众使用的停靠栏
 Comment[zh_TW]=給大眾使用的 Dock
 GenericName=Dock
+GenericName[az]=Dok
 GenericName[ca]=Acobla
 GenericName[ca@valencia]=Acobla
 GenericName[cs]=Dok
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@ -3,6 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=Latte/Indicator

 Comment=Latte indicator
+Comment[az]=Latte İndikatoru
 Comment[ca]=Indicador del Latte
 Comment[ca@valencia]=Indicador del Latte
 Comment[cs]=Ukazatel Latte
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Indicator
+Name[az]=İndikaator
 Name[ca]=Indicador
 Name[ca@valencia]=Indicador
 Name[cs]=Ukazatel
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
+Name[az]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
@ -32,6 +33,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
+Comment[az]=Latte Dok paneli üçün təmin edilən qoruma
 Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[da]=Beholder til Latte-dokken
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
+Name[az]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
@ -32,6 +33,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
+Comment[az]=Latte Dok paneli üçün təmin edilən qoruma
 Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[da]=Beholder til Latte-dokken
--- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Standard Latte Menu
+Name[az]=Standart Latte menyusu
 Name[ca]=Menú estàndard del Latte
 Name[ca@valencia]=Menú estàndard del Latte
 Name[cs]=Standardní nabídka Latte
@ -30,6 +31,7 @@ Name[x-test]=xxStandard Latte Menuxx
 Name[zh_CN]=标准 Latte 菜单
 Name[zh_TW]=標準的 Latte 選單
 Comment=The latte menu that normally shows on right-click
+Comment[az]=Sağ düymə kliki ilə göstəriləcək Latte menyusu
 Comment[ca]=El menú del Latte que es mostra normalment amb un clic del botó dret
 Comment[ca@valencia]=El menú del Latte que es mostra normalment amb un clic del botó dret
 Comment[cs]=Nabídka Latte, jenž se běžně zobrazuje při kliknutí pravým tlačítkem
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Latte
+Name[az]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
@ -31,6 +32,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Latte default indicator
+Comment[az]=Latte standart indikatoru
 Comment[ca]=Indicador predeterminat del Latte
 Comment[ca@valencia]=Indicador predeterminat del Latte
 Comment[cs]=Výchozí ukazatel Latte
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Plasma
+Name[az]=Plasma
 Name[ca]=Plasma
 Name[ca@valencia]=Plasma
 Name[cs]=Plasma
@ -31,6 +32,7 @@ Name[x-test]=xxPlasmaxx
 Name[zh_CN]=Plasma
 Name[zh_TW]=Plasma
 Comment=Latte Plasma style indicator
+Comment[az]=Latte Plasma üslubu indikatoru
 Comment[ca]=Indicador a l'estil Plasma per al Latte
 Comment[ca@valencia]=Indicador a l'estil Plasma per al Latte
 Comment[cs]=Ukazatel Latte ve stylu Plasma
--- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
+++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Plasma Tab Style
+Name[az]=Plasma Vərəq Üslubu
 Name[ca]=Estil pestanya del Plasma
 Name[ca@valencia]=Estil pestanya del Plasma
 Name[cs]=Styl Karet Plasma
@ -24,6 +25,7 @@ Name[x-test]=xxPlasma Tab Stylexx
 Name[zh_CN]=Plasma 标签样式
 Name[zh_TW]=Plasma 分頁樣式
 Comment=Plasma Tab style indicator for Latte
+Comment[az]=Latte üçün Plasma Vərəq Üslubu indikatoru
 Comment[ca]=Indicador a l'estil pestanya del Plasma per al Latte
 Comment[ca@valencia]=Indicador a l'estil pestanya del Plasma per al Latte
 Comment[cs]=Ukazatel stylu Karet Plasma pro Latte
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Latte Tasks
+Name[az]=Latte Tapşırıqları
 Name[ca]=Tasques del Latte
 Name[ca@valencia]=Tasques del Latte
 Name[cs]=Úlohy Latte
@ -29,6 +30,7 @@ Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
+Comment[az]=Latte Dok'dan Tapşırılar plasmoid'i
 Comment[ca]=Plasmoide de tasques de l'acoblador Latte
 Comment[ca@valencia]=Plasmoide de tasques de l'acoblador Latte
 Comment[cs]=Plasmoid úloh z doku Latte
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Latte Tasks
+Name[az]=Latte Tapşırıqları
 Name[ca]=Tasques del Latte
 Name[ca@valencia]=Tasques del Latte
 Name[cs]=Úlohy Latte
@ -29,6 +30,7 @@ Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
+Comment[az]=Latte Dok'dan Tapşırılar plasmoid'i
 Comment[ca]=Plasmoide de tasques de l'acoblador Latte
 Comment[ca@valencia]=Plasmoide de tasques de l'acoblador Latte
 Comment[cs]=Plasmoid úloh z doku Latte
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte Shell
+Name[az]=Latte Üzlüyü
 Name[ca]=Intèrpret d'ordres del Latte
 Name[ca@valencia]=Intèrpret d'ordres del Latte
 Name[cs]=Shell Latte
@ -31,6 +32,7 @@ Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
+Comment[az]=Latte Dok paneli üçün nəzərdə tutulan üzlük
 Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[da]=Skal til Latte-dokken
@ -61,6 +63,7 @@ Comment[zh_CN]=用于 Latte 停靠栏的 Shell
 Comment[zh_TW]=由 Latte Dock 提供的 Shell

 Keywords=shell
+Keywords[az]=üzlük
 Keywords[ca]=intèrpret d'ordres
 Keywords[ca@valencia]=intèrpret d'ordres
 Keywords[cs]=shell
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte Shell
+Name[az]=Latte Üzlüyü
 Name[ca]=Intèrpret d'ordres del Latte
 Name[ca@valencia]=Intèrpret d'ordres del Latte
 Name[cs]=Shell Latte
@ -31,6 +32,7 @@ Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
+Comment[az]=Latte Dok paneli üçün nəzərdə tutulan üzlük
 Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[da]=Skal til Latte-dokken
@ -61,6 +63,7 @@ Comment[zh_CN]=用于 Latte 停靠栏的 Shell
 Comment[zh_TW]=由 Latte Dock 提供的 Shell

 Keywords=shell
+Keywords[az]=üzlük
 Keywords[ca]=intèrpret d'ordres
 Keywords[ca@valencia]=intèrpret d'ordres
 Keywords[cs]=shell