update translations for master

and force-fix errors using pocheck

Change-Id: Ief082cee65d31c24f50f8c500bbc5fb14c55ac27

1 files changed, 78 insertions, 51 deletions

diff --git a/source/ja/helpcontent2/source/text/shared/guide.po b/source/ja/helpcontent2/source/text/shared/guide.po
index 1d79d6b972c..8d006896da0 100644
--- a/source/ja/helpcontent2/source/text/shared/guide.po
+++ b/source/ja/helpcontent2/source/text/shared/guide.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2024-01-08 15:05+0100\n"
+"POT-Creation-Date: 2024-02-02 00:04+0100\n"
 "PO-Revision-Date: 2022-12-12 13:30+0000\n"
 "Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
 "Language-Team: Japanese <https://translations.documentfoundation.org/projects/libo_help-master/textsharedguide/ja/>\n"
@@ -3238,31 +3238,31 @@ msgctxt ""
 msgid "<variable id=\"okbutton\">Once the connection is defined, click <emph>OK</emph> to connect. The dialog will dim until the connection is established with the server.</variable> A dialog asking for the user name and the password may pop up to let you log in the server. Proceed entering the right user name and password."
 msgstr ""
 
-#. CuNJe
+#. A58aK
 #: cmis-remote-files-setup.xhp
 msgctxt ""
 "cmis-remote-files-setup.xhp\n"
 "bm_id170820161240508275\n"
 "help.text"
-msgid "<bookmark_value>SSH;remote file service setup</bookmark_value>  <bookmark_value>FTP;remote file service setup</bookmark_value>  <bookmark_value>remote file service setup;FTP</bookmark_value>  <bookmark_value>remote file service setup;SSH</bookmark_value>"
+msgid "<bookmark_value>SSH;remote file service setup</bookmark_value>  <bookmark_value>remote file service setup;SSH</bookmark_value>"
 msgstr ""
 
-#. ovgDN
+#. ryMGU
 #: cmis-remote-files-setup.xhp
 msgctxt ""
 "cmis-remote-files-setup.xhp\n"
 "hd_id1508201618160340\n"
 "help.text"
-msgid "Connecting to <link href=\"text/shared/00/00000002.xhp#ftp\">FTP</link> and SSH servers"
+msgid "Connecting to SSH servers"
 msgstr ""
 
-#. 29qXd
+#. D99tw
 #: cmis-remote-files-setup.xhp
 msgctxt ""
 "cmis-remote-files-setup.xhp\n"
 "par_id150820161816039418\n"
 "help.text"
-msgid "<emph>Type</emph>: FTP or SSH"
+msgid "<emph>Type</emph>: SSH"
 msgstr ""
 
 #. A4WZP
@@ -3274,22 +3274,22 @@ msgctxt ""
 msgid "<emph>Host</emph>: the server URL, usually in the form <item type=\"literal\">file.service.com</item>"
 msgstr ""
 
-#. GCNsN
+#. NHcwS
 #: cmis-remote-files-setup.xhp
 msgctxt ""
 "cmis-remote-files-setup.xhp\n"
 "par_id150820161816046286\n"
 "help.text"
-msgid "<emph>Port</emph>: port number (usually 21 for FTP and 22 for SSH)."
+msgid "<emph>Port</emph>: port number (usually 22 for SSH)."
 msgstr ""
 
-#. 4kS9e
+#. smhDd
 #: cmis-remote-files-setup.xhp
 msgctxt ""
 "cmis-remote-files-setup.xhp\n"
 "par_id150820161816041989\n"
 "help.text"
-msgid "<emph>User, Password</emph>: the username and password of the FTP service."
+msgid "<emph>User, Password</emph>: the username and password of the service."
 msgstr ""
 
 #. BoDeK
@@ -3499,13 +3499,13 @@ msgctxt ""
 msgid "%PRODUCTNAME can open and save files stored on remote servers. Keeping files on remote servers allows to work with the documents using different computers. For example, you can work on a document in the office during the day and edit it at home for last-minute changes. Storing files on a remote server also protects them from computer loss or hard disk failure. Some servers are also able to check in and check out files, thus controlling their usage and access."
 msgstr ""
 
-#. guAGA
+#. dMPrT
 #: cmis-remote-files.xhp
 msgctxt ""
 "cmis-remote-files.xhp\n"
 "par_id150820161816033566\n"
 "help.text"
-msgid "%PRODUCTNAME supports many document servers that use well known network protocols such as FTP, WebDAV, Windows share, and SSH. It also supports popular services like Google Drive as well as commercial and open source servers that implement the OASIS CMIS standard."
+msgid "%PRODUCTNAME supports many document servers that use well known network protocols such as WebDAV, Windows share, and SSH. It also supports popular services like Google Drive as well as commercial and open source servers that implement the OASIS CMIS standard."
 msgstr ""
 
 #. f6m3j
@@ -3625,13 +3625,13 @@ msgctxt ""
 msgid "Checking out a document locks it, preventing other users from writing changes to it. Only one user can have a particular document checked out (locked) at any time. Checking in a document or canceling the checkout unlocks the document."
 msgstr ""
 
-#. G7pkL
+#. iz2Yh
 #: cmis-remote-files.xhp
 msgctxt ""
 "cmis-remote-files.xhp\n"
 "par_id170820161605426690\n"
 "help.text"
-msgid "There are no checkin/checkout controls for remote files in Windows Shares, WebDAV, FTP and SSH services."
+msgid "There are no checkin/checkout controls for remote files in Windows Shares, WebDAV and SSH services."
 msgstr ""
 
 #. ykFEK
@@ -3841,24 +3841,6 @@ msgctxt ""
 msgid "In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time."
 msgstr "%PRODUCTNAME Writer、Impress、および Draw では、一度に 1 人のユーザーだけがドキュメントを開いて書き込めます。Calc では、複数のユーザーが同じ表計算ドキュメントを同時に開いて書き込めます。"
 
-#. gTAdP
-#: collab.xhp
-msgctxt ""
-"collab.xhp\n"
-"par_id9590136\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ドキュメントの共有を有効または無効にできる「ドキュメントの共有」ダイアログを開きます。</ahelp>"
-
-#. W6AHL
-#: collab.xhp
-msgctxt ""
-"collab.xhp\n"
-"par_id2519913\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ドキュメントをほかのユーザーと共有できるようにします。共有されていないドキュメントの使用を無効にします。このドキュメントを最後に開いたり、保存したりしたあとに、ほかのユーザーが加えた未保存の編集が無効になります。</ahelp>"
-
 #. yLhB5
 #: collab.xhp
 msgctxt ""
@@ -4003,50 +3985,95 @@ msgctxt ""
 msgid "The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode."
 msgstr "ドキュメントが共有モードであり、このモードではいくつかの機能が使用できないことをユーザーに伝えるメッセージが表示されます。ユーザーは、次回のメッセージの表示を無効にできます。「OK」をクリックすると、ドキュメントが共有モードで開きます。"
 
-#. nVjSQ
+#. uCtRi
+#: collab.xhp
+msgctxt ""
+"collab.xhp\n"
+"hd_id401704727687777\n"
+"help.text"
+msgid "Resolve Conflicts dialog"
+msgstr ""
+
+#. vSBHr
 #: collab.xhp
 msgctxt ""
 "collab.xhp\n"
 "par_id5800653\n"
 "help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">同じ内容が別のユーザーによって変更された場合は、「コンフリクトの解決」 ダイアログが開きます。それぞれのコンフリクトについて、保持する変更を決定します。</ahelp>"
+msgid "<ahelp hid=\".\">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp>"
+msgstr ""
+
+#. GPWds
+#: collab.xhp
+msgctxt ""
+"collab.xhp\n"
+"hd_id1001704727711775\n"
+"help.text"
+msgid "Keep Mine"
+msgstr ""
 
-#. bcDee
+#. QVkZk
 #: collab.xhp
 msgctxt ""
 "collab.xhp\n"
 "par_id6263924\n"
 "help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Keeps your change, voids the other change.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">自分で加えた変更を保持し、ほかのユーザーが加えた変更を無効にします。</ahelp>"
+msgid "<ahelp hid=\".\">Keeps your change, voids the other change.</ahelp>"
+msgstr ""
+
+#. EBzEe
+#: collab.xhp
+msgctxt ""
+"collab.xhp\n"
+"hd_id781704727739081\n"
+"help.text"
+msgid "Keep Other"
+msgstr ""
 
-#. RZ2gA
+#. qsr52
 #: collab.xhp
 msgctxt ""
 "collab.xhp\n"
 "par_id3609118\n"
 "help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Keeps the change of the other user, voids your change.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ほかのユーザーが加えた変更を保持し、自分が加えた変更を無効にします。</ahelp>"
+msgid "<ahelp hid=\".\">Keeps the change of the other user, voids your change.</ahelp>"
+msgstr ""
 
-#. P3uKC
+#. tA4eD
+#: collab.xhp
+msgctxt ""
+"collab.xhp\n"
+"hd_id931704727781391\n"
+"help.text"
+msgid "Keep All Mine"
+msgstr ""
+
+#. 2JEYD
 #: collab.xhp
 msgctxt ""
 "collab.xhp\n"
 "par_id7184057\n"
 "help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Keeps all your changes, voids all other changes.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">自分が加えたすべての変更を保持し、ほかのユーザーが加えたすべての変更を無効にします。</ahelp>"
+msgid "<ahelp hid=\".\">Keeps all your changes, voids all other changes.</ahelp>"
+msgstr ""
 
-#. UnoZD
+#. m5UUm
+#: collab.xhp
+msgctxt ""
+"collab.xhp\n"
+"hd_id681704727819702\n"
+"help.text"
+msgid "Keep All Others"
+msgstr ""
+
+#. i8MDM
 #: collab.xhp
 msgctxt ""
 "collab.xhp\n"
 "par_id786767\n"
 "help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Keeps the changes of all other users, voids your changes.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ほかのすべてのユーザーが加えた変更を保持し、自分が加えた変更を無効にします。</ahelp>"
+msgid "<ahelp hid=\".\">Keeps the changes of all other users, voids your changes.</ahelp>"
+msgstr ""
 
 #. 4fXQR
 #: collab.xhp
@@ -11122,14 +11149,14 @@ msgctxt ""
 msgid "Saving Documents"
 msgstr "ドキュメントの保存"
 
-#. VE5up
+#. DF9Gv
 #: doc_save.xhp
 msgctxt ""
 "doc_save.xhp\n"
 "bm_id3147226\n"
 "help.text"
-msgid "<bookmark_value>documents; saving</bookmark_value><bookmark_value>saving; documents</bookmark_value><bookmark_value>backups; documents</bookmark_value><bookmark_value>files; saving</bookmark_value><bookmark_value>text documents; saving</bookmark_value><bookmark_value>spreadsheets; saving</bookmark_value><bookmark_value>drawings; saving</bookmark_value><bookmark_value>presentations; saving</bookmark_value><bookmark_value>FTP; saving documents</bookmark_value>"
-msgstr "<bookmark_value>ドキュメント; 保存</bookmark_value><bookmark_value>保存; ドキュメント</bookmark_value><bookmark_value>バックアップ; ドキュメント</bookmark_value><bookmark_value>ファイル; 保存</bookmark_value><bookmark_value>文書ドキュメント; 保存</bookmark_value><bookmark_value>表計算ドキュメント; 保存</bookmark_value><bookmark_value>図形描画; 保存</bookmark_value><bookmark_value>プレゼンテーション; 保存</bookmark_value><bookmark_value>FTP; ドキュメントを保存する</bookmark_value>"
+msgid "<bookmark_value>documents; saving</bookmark_value><bookmark_value>saving; documents</bookmark_value><bookmark_value>backups; documents</bookmark_value><bookmark_value>files; saving</bookmark_value><bookmark_value>text documents; saving</bookmark_value><bookmark_value>spreadsheets; saving</bookmark_value><bookmark_value>drawings; saving</bookmark_value><bookmark_value>presentations; saving</bookmark_value>"
+msgstr ""
 
 #. irkmW
 #: doc_save.xhp