1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-26 18:03:42 +03:00

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"
This commit is contained in:
l10n daemon script 2018-01-23 05:07:55 +01:00
parent 6583617380
commit 6f084726a9
9 changed files with 16 additions and 0 deletions

View File

@ -10,6 +10,7 @@ Name[pt]=Disposições do Latte
Name[sv]=Latte layouter
Name[uk]=Компонування Латте
Name[x-test]=xxLatte Layoutsxx
Name[zh_CN]=Latte 布局
ProvidersUrl=https://download.kde.org/ocs/providers.xml
Categories=Latte Layouts

View File

@ -49,6 +49,7 @@ Name[pt]=A configuração foi importada com sucesso
Name[sv]=Inställning importerad med lyckat resultat
Name[uk]=Налаштування успішно імпортовано
Name[x-test]=xxConfiguration imported successfullyxx
Name[zh_CN]=配置成功导入
Name[zh_TW]=設定匯入成功
Action=Popup
@ -68,6 +69,7 @@ Name[pt]=Não foi possível importar a configuração
Name[sv]=Misslyckades importera inställning
Name[uk]=Не вдалося імпортувати налаштування
Name[x-test]=xxFailed to import configurationxx
Name[zh_CN]=配置导入失败
Name[zh_TW]=匯入設定失敗
Action=Popup
@ -87,6 +89,7 @@ Name[pt]=A configuração foi exportada com sucesso
Name[sv]=Inställning exporterad med lyckat resultat
Name[uk]=Налаштування успішно експортовано
Name[x-test]=xxConfiguration exported successfullyxx
Name[zh_CN]=配置成功导出
Name[zh_TW]=設定匯出成功
Action=Popup
@ -106,6 +109,7 @@ Name[pt]=Não foi possível exportar a configuração
Name[sv]=Misslyckades exportera inställning
Name[uk]=Не вдалося експортувати налаштування
Name[x-test]=xxFailed to export configurationxx
Name[zh_CN]=配置导出失败
Name[zh_TW]=匯出設定失敗
Action=Popup
@ -125,5 +129,6 @@ Name[pt]=Mudar para a disposição
Name[sv]=Byt till layout
Name[uk]=Перемкнутися на компонування
Name[x-test]=xxSwitch to layoutxx
Name[zh_CN]=切换布局
Name[zh_TW]=切換至佈局
Action=Popup

View File

@ -16,6 +16,7 @@ Name[pt]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Dock for the masses
Comment[ca]=Acoblador per a les masses
@ -32,6 +33,7 @@ Comment[pt]=Área acoplável para as massas
Comment[sv]=Dockningsfönster för alla
Comment[uk]=Панель для усіх
Comment[x-test]=xxDock for the massesxx
Comment[zh_CN]=使
Comment[zh_TW]=使 Dock
GenericName=Dock
GenericName[ca]=Acobla

View File

@ -30,6 +30,7 @@ Comment[pt]=Reservar espaços em branco dentro da área acoplável.
Comment[sv]=Reservera tomt utrymme inne i dockningsfönstret.
Comment[uk]=Створює прогалини на панелі.
Comment[x-test]=xxReserve empty spaces within the dock.xx
Comment[zh_CN]=
Comment[zh_TW]= dock
Encoding=UTF-8
@ -49,6 +50,7 @@ Keywords[pt]=espaço
Keywords[sv]=mellanrum
Keywords[uk]=розпірка
Keywords[x-test]=xxspacerxx
Keywords[zh_CN]=spacer
Keywords[zh_TW]=
NoDisplay=true

View File

@ -30,6 +30,7 @@ Comment[pt]=Reservar espaços em branco dentro da área acoplável.
Comment[sv]=Reservera tomt utrymme inne i dockningsfönstret.
Comment[uk]=Створює прогалини на панелі.
Comment[x-test]=xxReserve empty spaces within the dock.xx
Comment[zh_CN]=
Comment[zh_TW]= dock
Encoding=UTF-8
@ -49,6 +50,7 @@ Keywords[pt]=espaço
Keywords[sv]=mellanrum
Keywords[uk]=розпірка
Keywords[x-test]=xxspacerxx
Keywords[zh_CN]=spacer
Keywords[zh_TW]=
NoDisplay=true

View File

@ -17,6 +17,7 @@ Name[pt]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Containment provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock

View File

@ -17,6 +17,7 @@ Name[pt]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Containment provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock

View File

@ -15,6 +15,7 @@ Name[pt]=Consola do Latte
Name[sv]=Latte skal
Name[uk]=Оболонка Латте
Name[x-test]=xxLatte Shellxx
Name[zh_CN]=Latte Shell
Name[zh_TW]=Latte Shell
Comment=Shell provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock

View File

@ -15,6 +15,7 @@ Name[pt]=Consola do Latte
Name[sv]=Latte skal
Name[uk]=Оболонка Латте
Name[x-test]=xxLatte Shellxx
Name[zh_CN]=Latte Shell
Name[zh_TW]=Latte Shell
Comment=Shell provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock